From 217c988eed4d0d9b9cfaf946c3b03c7063ff2d05 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 12 Mar 2008 14:15:00 +0100
Subject: [PATCH] --- yaml --- r: 87199 b: refs/heads/master c:
 50c3304a5e1e5217fc6b58fb686edc7d1114f2fa h: refs/heads/master i:   87197:
 6baa51bd516c04c0d13fc85e4f642455ac59f916   87195:
 49013b648cb6a04ad3c14b88ba8a11f1356833bc   87191:
 262edc7f32b37a434032aebef2b92b2789f9e0f4   87183:
 3830a38112f08215e5b348ab69576976b1f11bcd   87167:
 fdc36f69c240e2db80c0f07da386a53178bd4cd5 v: v3

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

diff --git a/[refs] b/[refs]
index 0816dbaf2fca..05b9f5958bba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5edc68b8530ff1b3133d057350da98c93cca5a82
+refs/heads/master: 50c3304a5e1e5217fc6b58fb686edc7d1114f2fa
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index 96da22e9a5a4..fd84b2a36338 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -90,12 +90,16 @@ static int i2c_device_probe(struct device *dev)
 {
 	struct i2c_client	*client = to_i2c_client(dev);
 	struct i2c_driver	*driver = to_i2c_driver(dev->driver);
+	int status;
 
 	if (!driver->probe)
 		return -ENODEV;
 	client->driver = driver;
 	dev_dbg(dev, "probe\n");
-	return driver->probe(client);
+	status = driver->probe(client);
+	if (status)
+		client->driver = NULL;
+	return status;
 }
 
 static int i2c_device_remove(struct device *dev)