[i2c] [PATCH 08/13] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers

[Jean Delvare]

From: "Mark M. Hoffman" <mhoffman at lightlink.com>
Content-Disposition: inline; filename=i2c-algo-error-handling-fix.patch

It is possible for i2c_add_adapter() to fail.  Several I2C algorithm
drivers ignore that fact.  This (compile-tested only) patch fixes them.

Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
 drivers/i2c/algos/i2c-algo-bit.c    |    3 +--
 drivers/i2c/algos/i2c-algo-ite.c    |    4 +---
 drivers/i2c/algos/i2c-algo-pca.c    |    6 +++---
 drivers/i2c/algos/i2c-algo-pcf.c    |    8 +++++---
 drivers/i2c/algos/i2c-algo-sibyte.c |    4 +---
 5 files changed, 11 insertions(+), 14 deletions(-)

--- linux-2.6.17-git.orig/drivers/i2c/algos/i2c-algo-bit.c	2006-06-30 19:24:12.000000000 +0200
+++ linux-2.6.17-git/drivers/i2c/algos/i2c-algo-bit.c	2006-07-01 16:04:41.000000000 +0200
@@ -544,8 +544,7 @@
 	adap->timeout = 100;	/* default values, should	*/
 	adap->retries = 3;	/* be replaced by defines	*/
 
-	i2c_add_adapter(adap);
-	return 0;
+	return i2c_add_adapter(adap);
 }
 
 
--- linux-2.6.17-git.orig/drivers/i2c/algos/i2c-algo-pca.c	2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.17-git/drivers/i2c/algos/i2c-algo-pca.c	2006-07-01 16:04:41.000000000 +0200
@@ -374,10 +374,10 @@
 	adap->timeout = 100;		/* default values, should	*/
 	adap->retries = 3;		/* be replaced by defines	*/
 
-	rval = pca_init(pca_adap);
+	if ((rval = pca_init(pca_adap)))
+		return rval;
 
-	if (!rval)
-		i2c_add_adapter(adap);
+	rval = i2c_add_adapter(adap);
 
 	return rval;
 }
--- linux-2.6.17-git.orig/drivers/i2c/algos/i2c-algo-pcf.c	2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.17-git/drivers/i2c/algos/i2c-algo-pcf.c	2006-07-01 16:04:41.000000000 +0200
@@ -479,9 +479,11 @@
 	adap->timeout = 100;		/* default values, should	*/
 	adap->retries = 3;		/* be replaced by defines	*/
 
-	rval = pcf_init_8584(pcf_adap);
-	if (!rval)
-		i2c_add_adapter(adap);
+	if ((rval = pcf_init_8584(pcf_adap)))
+		return rval;
+
+	rval = i2c_add_adapter(adap);
+
 	return rval;
 }
 
--- linux-2.6.17-git.orig/drivers/i2c/algos/i2c-algo-sibyte.c	2006-06-30 19:24:11.000000000 +0200
+++ linux-2.6.17-git/drivers/i2c/algos/i2c-algo-sibyte.c	2006-07-01 16:04:41.000000000 +0200
@@ -173,9 +173,7 @@
 		printk("\n");
 	}
 
-	i2c_add_adapter(i2c_adap);
-
-	return 0;
+	return i2c_add_adapter(i2c_adap);
 }
 
 
--- linux-2.6.17-git.orig/drivers/i2c/algos/i2c-algo-ite.c	2006-06-26 20:07:12.000000000 +0200
+++ linux-2.6.17-git/drivers/i2c/algos/i2c-algo-ite.c	2006-07-01 16:04:41.000000000 +0200
@@ -742,10 +742,8 @@
 	adap->retries = 3;		/* be replaced by defines	*/
 	adap->flags = 0;
 
-	i2c_add_adapter(adap);
 	iic_init(iic_adap);
-
-	return 0;
+	return i2c_add_adapter(adap);
 }
 
 

-- 
Jean Delvare