Commit ca3f481d authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

[PATCH] Fix Oops & warning on PPC in rivafb

Independently from the other fbdev updates I'm cooking (some of them
will be in your mailbox rsn), this 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.
parent a2908413
...@@ -1615,8 +1615,9 @@ static int __devinit riva_set_fbinfo(struct fb_info *info) ...@@ -1615,8 +1615,9 @@ static int __devinit riva_set_fbinfo(struct fb_info *info)
} }
#ifdef CONFIG_PPC_OF #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; struct device_node *dp;
unsigned char *pedid = NULL; unsigned char *pedid = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment