From 2779fce938e9221af637669f3775132e2a1dac8b Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 13 Apr 2009 17:02:14 +0200
Subject: [PATCH] --- yaml --- r: 143102 b: refs/heads/master c:
 935298696f469c0e07c73be687bd055878074ce0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4e421c9d373f..6364509a66f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c758e8cffe3b1bc7970d579371db01b19ff440bf
+refs/heads/master: 935298696f469c0e07c73be687bd055878074ce0
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index b6f3a0de6ca2..85e2e919d1cd 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -716,8 +716,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 
 	/* new style driver methods can't mix with legacy ones */
 	if (is_newstyle_driver(driver)) {
-		if (driver->attach_adapter || driver->detach_adapter
-				|| driver->detach_client) {
+		if (driver->detach_adapter || driver->detach_client) {
 			printk(KERN_WARNING
 					"i2c-core: driver [%s] is confused\n",
 					driver->driver.name);