[i2c] [PATCH 03/13] i2c-isa: Fail adding driver on attach_adapter error

[Jean Delvare]

From: David Hubbard <david.c.hubbard at gmail.com>
Content-Disposition: inline; filename=i2c-isa-return-attach_adapter.patch

i2c-isa: Fail adding driver on attach_adapter error

Signed-off-by: David Hubbard <david.c.hubbard at gmail.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
 drivers/i2c/busses/i2c-isa.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- linux-2.6.18-rc4.orig/drivers/i2c/busses/i2c-isa.c	2006-08-15 22:20:26.000000000 +0200
+++ linux-2.6.18-rc4/drivers/i2c/busses/i2c-isa.c	2006-08-18 11:10:44.000000000 +0200
@@ -89,9 +89,14 @@
 	dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->driver.name);
 
 	/* Now look for clients */
-	driver->attach_adapter(&isa_adapter);
-
-	return 0;
+	res = driver->attach_adapter(&isa_adapter);
+	if (res) {
+		dev_err(&isa_adapter.dev,
+			"Driver %s failed to attach adapter, unregistering\n",
+			driver->driver.name);
+		driver_unregister(&driver->driver);
+	}
+	return res;
 }
 
 int i2c_isa_del_driver(struct i2c_driver *driver)

-- 
Jean Delvare