[PATCH] fbdev: Fix crashes in various fbdev's blank routines

[linux-2.6-omap-h63xx.git] / drivers / video / nvidia / nv_i2c.c

diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index ace484fa61ce09fb00512d54d5e7eee2bcfc6a3d..19eef3a090232854860ad993365993dc7e5f68f6 100644 (file)
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -10,7 +10,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -46,7 +45,7 @@ static void nvidia_gpio_setscl(void *data, int state)
 
 static void nvidia_gpio_setsda(void *data, int state)
 {
-       struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data;
+       struct nvidia_i2c_chan *chan = data;
        struct nvidia_par *par = chan->par;
        u32 val;
 
@@ -64,7 +63,7 @@ static void nvidia_gpio_setsda(void *data, int state)
 
 static int nvidia_gpio_getscl(void *data)
 {
-       struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data;
+       struct nvidia_i2c_chan *chan = data;
        struct nvidia_par *par = chan->par;
        u32 val = 0;
 
@@ -79,7 +78,7 @@ static int nvidia_gpio_getscl(void *data)
 
 static int nvidia_gpio_getsda(void *data)
 {
-       struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data;
+       struct nvidia_i2c_chan *chan = data;
        struct nvidia_par *par = chan->par;
        u32 val = 0;
 
@@ -136,13 +135,13 @@ void nvidia_create_i2c_busses(struct nvidia_par *par)
        par->chan[2].par = par;
 
        par->chan[0].ddc_base = 0x3e;
-       nvidia_setup_i2c_bus(&par->chan[0], "BUS1");
+       nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0");
 
        par->chan[1].ddc_base = 0x36;
-       nvidia_setup_i2c_bus(&par->chan[1], "BUS2");
+       nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1");
 
        par->chan[2].ddc_base = 0x50;
-       nvidia_setup_i2c_bus(&par->chan[2], "BUS3");
+       nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2");
 }
 
 void nvidia_delete_i2c_busses(struct nvidia_par *par)
@@ -209,14 +208,16 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
 
        if (!edid && conn == 1) {
                /* try to get from firmware */
-               edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-               if (edid)
-                       memcpy(edid, fb_firmware_edid(info->device),
-                              EDID_LENGTH);
+               const u8 *e = fb_firmware_edid(info->device);
+
+               if (e != NULL) {
+                       edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
+                       if (edid)
+                               memcpy(edid, e, EDID_LENGTH);
+               }
        }
 
-       if (out_edid)
-               *out_edid = edid;
+       *out_edid = edid;
 
        return (edid) ? 0 : 1;
 }