Merge ../linux-2.6-watchdog-mm

[powerpc.git] / drivers / video / fb_ddc.c

diff --git a/drivers/video/fb_ddc.c b/drivers/video/fb_ddc.c
index 3aa6ebf..f836137 100644 (file)
--- a/drivers/video/fb_ddc.c
+++ b/drivers/video/fb_ddc.c
@@ -20,26 +20,26 @@
 static unsigned char *fb_do_probe_ddc_edid(struct i2c_adapter *adapter)
 {
        unsigned char start = 0x0;
+       unsigned char *buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
        struct i2c_msg msgs[] = {
                {
                        .addr   = DDC_ADDR,
+                       .flags  = 0,
                        .len    = 1,
                        .buf    = &start,
                }, {
                        .addr   = DDC_ADDR,
                        .flags  = I2C_M_RD,
                        .len    = EDID_LENGTH,
+                       .buf    = buf,
                }
        };
-       unsigned char *buf;
 
-       buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
        if (!buf) {
                dev_warn(&adapter->dev, "unable to allocate memory for EDID "
                         "block.\n");
                return NULL;
        }
-       msgs[1].buf = buf;
 
        if (i2c_transfer(adapter, msgs, 2) == 2)
                return buf;