---

yaml --- r: 101293 b: refs/heads/master c: f7050bd h: refs/heads/master i: 101291: c2e1c17 v: v3
git-mirror · Jul 14, 2008 · e3e3a14 · e3e3a14
1 parent 35bb616
commit e3e3a14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a03cd931196673634b58c955d2f9d42da602045
+refs/heads/master: f7050bd716047a4dfec7d061e28df7ffd6815ebd
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
@@ -743,13 +743,11 @@ void i2c_del_driver(struct i2c_driver *driver)
 {
 	mutex_lock(&core_lock);
 
-	/* new-style driver? */
-	if (is_newstyle_driver(driver))
-		goto unregister;
-
-	class_for_each_device(&i2c_adapter_class, driver, __detach_adapter);
+	/* legacy driver? */
+	if (!is_newstyle_driver(driver))
+		class_for_each_device(&i2c_adapter_class, driver,
+				      __detach_adapter);
 
- unregister:
 	driver_unregister(&driver->driver);
 	pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);