From 0384f60f889c8f89c2d29c75e9b2c7008369072d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 16 Nov 2006 22:18:28 -0800
Subject: [PATCH] --- yaml --- r: 41002 b: refs/heads/master c:
 4be703906cffd5902028d20626e636ba21fb0b61 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/video/fb_ddc.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f902770b041f..e8eb298276e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f71c5de19c27f2198105d3b26b398494d5c353b
+refs/heads/master: 4be703906cffd5902028d20626e636ba21fb0b61
diff --git a/trunk/drivers/video/fb_ddc.c b/trunk/drivers/video/fb_ddc.c
index 3aa6ebf68f17..f836137a0eda 100644
--- a/trunk/drivers/video/fb_ddc.c
+++ b/trunk/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;