I2C: DaVinci: Fix GPIO expander driver

- Get i2c adapter with address 1 not 0 in davinci_i2c_expander_read
- Unlock mutex on error exit path in davinci_i2c_expander_op
Signed-off-by: Yusuf Caglar Akyuz <caglarakyuz@gmail.com>
Signed-off-by: Kevin Hilman <khilman@mvista.com>

drivers/i2c/chips/gpio_expander_davinci.c

@@ -26,8 +26,8 @@ static int davinci_i2c_expander_read(u8 size, u8 * val, u16 addr)
 	int err;
 	struct i2c_msg msg[1];
 
-        adap = i2c_get_adapter(0);
-        if (!adap)
+	adap = i2c_get_adapter(1);
+	if (!adap)
 		return -ENODEV;
 
 	msg->addr = addr;
@@ -48,7 +48,7 @@ static int davinci_i2c_expander_write(u8 size, u8 * val, u16 addr)
 	int err;
 	struct i2c_msg msg[1];
 
-        adap = i2c_get_adapter(0);
+	adap = i2c_get_adapter(1);
         if (!adap)
 		return -ENODEV;
 
@@ -76,8 +76,10 @@ int davinci_i2c_expander_op(u16 client_addr, u35_expander_ops pin, u8 val)
 	mutex_lock(&expander_lock);
 
 	err = davinci_i2c_expander_read(1, &data_to_u35, 0x3A);
-	if (err < 0)
+	if (err < 0) {
+		mutex_unlock(&expander_lock);
 		return err;
+	}
 
 	if (client_addr == 0x3A) {
 		switch (pin) {