Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile

1 files changed, 13 insertions, 3 deletions

diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index b9b7064a2be8..8591e4fc359f 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -211,7 +211,7 @@ static struct i2c_algo_bit_data cx18_i2c_algo_template = {
 /* init + register i2c algo-bit adapter */
 int init_cx18_i2c(struct cx18 *cx)
 {
-        int i;
+        int i, err;
         CX18_DEBUG_I2C("i2c init\n");
 
         for (i = 0; i < 2; i++) {
@@ -268,8 +268,18 @@ int init_cx18_i2c(struct cx18 *cx)
         cx18_call_hw(cx, CX18_HW_GPIO_RESET_CTRL,
                      core, reset, (u32) CX18_GPIO_RESET_I2C);
 
-        return i2c_bit_add_bus(&cx->i2c_adap[0]) ||
-                i2c_bit_add_bus(&cx->i2c_adap[1]);
+        err = i2c_bit_add_bus(&cx->i2c_adap[0]);
+        if (err)
+                goto err;
+        err = i2c_bit_add_bus(&cx->i2c_adap[1]);
+        if (err)
+                goto err_del_bus_0;
+        return 0;
+
+ err_del_bus_0:
+        i2c_del_adapter(&cx->i2c_adap[0]);
+ err:
+        return err;
 }
 
 void exit_cx18_i2c(struct cx18 *cx)