Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2004-02-14 17:31:44 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-14 17:31:44 -0800
commitca3f481da292d16461268fad5bbb3c0ecf1a7af6 (patch)
treefef6bbb18a719c7aeda9802d11f70a9e20474a70
parenta29084133422969181d4fa71e45104b0ce75f07a (diff)
[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.
-rw-r--r--drivers/video/riva/fbdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 172664f06df5..39237a028884 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1615,8 +1615,9 @@ static int __devinit riva_set_fbinfo(struct fb_info *info)
}
#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;