---

yaml --- r: 87199 b: refs/heads/master c: 50c3304 h: refs/heads/master i: 87197: 6baa51b 87195: 49013b6 87191: 262edc7 87183: 3830a38 87167: fdc36f6 v: v3
git-mirror · Mar 12, 2008 · 217c988 · 217c988
1 parent f9b0060
commit 217c988
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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)