Merge branch 'merge'

[pandora-kernel.git] / drivers / video / riva / fbdev.c

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 76fc9d3..511c362 100644 (file)
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -354,6 +354,9 @@ static struct backlight_properties riva_bl_data = {
 
 static void riva_bl_set_power(struct fb_info *info, int power)
 {
+       if (info->bl_dev == NULL)
+               return;
+
        mutex_lock(&info->bl_mutex);
        up(&info->bl_dev->sem);
        info->bl_dev->props->power = power;
@@ -382,7 +385,7 @@ static void riva_bl_init(struct riva_par *par)
        bd = backlight_device_register(name, par, &riva_bl_data);
        if (IS_ERR(bd)) {
                info->bl_dev = NULL;
-               printk("riva: Backlight registration failed\n");
+               printk(KERN_WARNING "riva: Backlight registration failed\n");
                goto error;
        }
 
@@ -1831,14 +1834,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
        NVTRACE_ENTER();
        dp = pci_device_to_OF_node(pd);
        for (; dp != NULL; dp = dp->child) {
-               disptype = (unsigned char *)get_property(dp, "display-type", NULL);
+               disptype = get_property(dp, "display-type", NULL);
                if (disptype == NULL)
                        continue;
                if (strncmp(disptype, "LCD", 3) != 0)
                        continue;
                for (i = 0; propnames[i] != NULL; ++i) {
-                       pedid = (unsigned char *)
-                               get_property(dp, propnames[i], NULL);
+                       pedid = get_property(dp, propnames[i], NULL);
                        if (pedid != NULL) {
                                par->EDID = pedid;
                                NVTRACE("LCD found.\n");