From 62badbf013aca63657b71d371a1df15a2cbc05b5 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 14 Jul 2008 22:38:30 +0200
Subject: [PATCH] --- yaml --- r: 101303 b: refs/heads/master c:
 e0457442fd522107204da14a2dc2cbbb5dcac5f6 h: refs/heads/master i:   101301:
 32a90222f78d6787b169af7af1021f4b1a241a08   101299:
 e067cb4d03b7792d440956493d34a9106f4a9432   101295:
 38f1ad8983d0aa3251d5f755f1e190751c80ac6e v: v3

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

diff --git a/[refs] b/[refs]
index f44113b1fae6..1dd5bd1fe42e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b4dff9cd37d430bc76112396e92bb3552f37ccd
+refs/heads/master: e0457442fd522107204da14a2dc2cbbb5dcac5f6
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index e06067ebd205..d6cc58abf3ff 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -101,19 +101,14 @@ 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);
-	const struct i2c_device_id *id;
 	int status;
 
-	if (!driver->probe)
+	if (!driver->probe || !driver->id_table)
 		return -ENODEV;
 	client->driver = driver;
 	dev_dbg(dev, "probe\n");
 
-	if (driver->id_table)
-		id = i2c_match_id(driver->id_table, client);
-	else
-		id = NULL;
-	status = driver->probe(client, id);
+	status = driver->probe(client, i2c_match_id(driver->id_table, client));
 	if (status)
 		client->driver = NULL;
 	return status;