From: Andrew Morton <akpm@osdl.org>
Date: Wed, 4 Oct 2006 09:16:24 +0000 (-0700)
Subject: [PATCH] fbdev: riva warning fix
X-Git-Tag: v2.6.19-rc1~92
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0271eb947db2704a0ff8be68d72915ab021d1ead;p=linux-2.6-omap-h63xx.git

[PATCH] fbdev: riva warning fix

drivers/video/riva/fbdev.c: In function `riva_get_EDID_OF':
drivers/video/riva/fbdev.c:1846: warning: assignment discards qualifiers from pointer target type

This code is being bad: copying a pointer to read-only OF data into a
non-const pointer.

Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index b120896c8ab..a433cc78ef9 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1843,7 +1843,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
 		for (i = 0; propnames[i] != NULL; ++i) {
 			pedid = get_property(dp, propnames[i], NULL);
 			if (pedid != NULL) {
-				par->EDID = pedid;
+				par->EDID = (unsigned char *)pedid;
 				NVTRACE("LCD found.\n");
 				return 1;
 			}