Merge remote-tracking branch 'asoc/fix/da7213' into asoc-linus

[~andy/linux] / drivers / i2c / busses / i2c-cbus-gpio.c

diff --git a/drivers/i2c/busses/i2c-cbus-gpio.c b/drivers/i2c/busses/i2c-cbus-gpio.c
index 98386d65931858701f7949cc4aed3cebaa103b06..1be13ac11dc5d615050deb2e03c58d530a99fb30 100644 (file)
--- a/drivers/i2c/busses/i2c-cbus-gpio.c
+++ b/drivers/i2c/busses/i2c-cbus-gpio.c
@@ -206,7 +206,9 @@ static int cbus_i2c_remove(struct platform_device *pdev)
 {
        struct i2c_adapter *adapter = platform_get_drvdata(pdev);
 
-       return i2c_del_adapter(adapter);
+       i2c_del_adapter(adapter);
+
+       return 0;
 }
 
 static int cbus_i2c_probe(struct platform_device *pdev)