[PATCH] Fix Oops & warning on PPC in rivafb

From: Benjamin Herrenschmidt
Date: Sun Feb 15 2004 - 02:08:22 EST


Hi !

Independently from the other fbdev updates I'm cooking (some of them will
be in your mailbox rsn), this patch fixes an error in parameter passing
to a function in rivafb (only used on ppc) that could cause an oops and
definitely causes a warning at compile time.

Please apply asap.

Ben.

===== drivers/video/riva/fbdev.c 1.52 vs edited =====
--- 1.52/drivers/video/riva/fbdev.c Fri Feb 13 03:39:59 2004
+++ edited/drivers/video/riva/fbdev.c Sun Feb 15 17:12:03 2004
@@ -1615,8 +1615,9 @@
}

#ifdef CONFIG_PPC_OF
-static int riva_get_EDID_OF(struct riva_par *par, struct pci_dev *pd)
+static int riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
{
+ struct riva_par *par = (struct riva_par *) info->par;
struct device_node *dp;
unsigned char *pedid = NULL;



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/