From 074b8a5c27c6d6b5b19eda7bd01ada0bbe73b3a6 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Fri, 23 Jul 2010 23:17:57 +0200
Subject: [PATCH] --- yaml --- r: 205106 b: refs/heads/master c:
 f1feda70b5dfdbe6a1069efffec099b430467331 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1d630e45586c..071e777cbc2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e04d8e829d7807e132d8c82c3554b164a803c617
+refs/heads/master: f1feda70b5dfdbe6a1069efffec099b430467331
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c b/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c
index 97ba89ef42a0..5588e66dd9fc 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -281,12 +281,23 @@ nouveau_i2c_find(struct drm_device *dev, int index)
 bool
 nouveau_probe_i2c_addr(struct nouveau_i2c_chan *i2c, int addr)
 {
-	struct i2c_msg msg = {
-		.addr = addr,
-		.len = 0,
+	uint8_t buf[] = { 0 };
+	struct i2c_msg msgs[] = {
+		{
+			.addr = addr,
+			.flags = 0,
+			.len = 1,
+			.buf = buf,
+		},
+		{
+			.addr = addr,
+			.flags = I2C_M_RD,
+			.len = 1,
+			.buf = buf,
+		}
 	};
 
-	return i2c_transfer(&i2c->adapter, &msg, 1) == 1;
+	return i2c_transfer(&i2c->adapter, msgs, 2) == 2;
 }
 
 int