Skip to contentSkip to conversation

Fix Oops & warning on PPC in rivafb

PATCH New Benjamin Herrenschmidt 1 participant 1 message Feb 15, 2004 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix Oops & warning on PPC in rivafb

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 =====

drivers/video/riva/fbdev.c +2 -1
@@ -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;