diff options
Diffstat (limited to 'drivers/video/riva/fbdev.c')
-rw-r--r-- | drivers/video/riva/fbdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 8ddb47a56b07..67d1e1c8813d 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
@@ -1835,14 +1835,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) | |||
1835 | NVTRACE_ENTER(); | 1835 | NVTRACE_ENTER(); |
1836 | dp = pci_device_to_OF_node(pd); | 1836 | dp = pci_device_to_OF_node(pd); |
1837 | for (; dp != NULL; dp = dp->child) { | 1837 | for (; dp != NULL; dp = dp->child) { |
1838 | disptype = (unsigned char *)get_property(dp, "display-type", NULL); | 1838 | disptype = get_property(dp, "display-type", NULL); |
1839 | if (disptype == NULL) | 1839 | if (disptype == NULL) |
1840 | continue; | 1840 | continue; |
1841 | if (strncmp(disptype, "LCD", 3) != 0) | 1841 | if (strncmp(disptype, "LCD", 3) != 0) |
1842 | continue; | 1842 | continue; |
1843 | for (i = 0; propnames[i] != NULL; ++i) { | 1843 | for (i = 0; propnames[i] != NULL; ++i) { |
1844 | pedid = (unsigned char *) | 1844 | pedid = get_property(dp, propnames[i], NULL); |
1845 | get_property(dp, propnames[i], NULL); | ||
1846 | if (pedid != NULL) { | 1845 | if (pedid != NULL) { |
1847 | par->EDID = pedid; | 1846 | par->EDID = pedid; |
1848 | NVTRACE("LCD found.\n"); | 1847 | NVTRACE("LCD found.\n"); |