Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[~andy/linux] / drivers / staging / media / go7007 / go7007-driver.c

diff --git a/drivers/staging/media/go7007/go7007-driver.c b/drivers/staging/media/go7007/go7007-driver.c
index a5ca99d7c0b29bad2d13d392fa5ef881df541092..3640df0aa0c1faf6e819a1395d2c846da6ba0ca5 100644 (file)
--- a/drivers/staging/media/go7007/go7007-driver.c
+++ b/drivers/staging/media/go7007/go7007-driver.c
@@ -242,11 +242,8 @@ static void go7007_remove(struct v4l2_device *v4l2_dev)
        if (go->hpi_ops->release)
                go->hpi_ops->release(go);
        if (go->i2c_adapter_online) {
-               if (i2c_del_adapter(&go->i2c_adapter) == 0)
-                       go->i2c_adapter_online = 0;
-               else
-                       v4l2_err(&go->v4l2_dev,
-                               "error removing I2C adapter!\n");
+               i2c_del_adapter(&go->i2c_adapter);
+               go->i2c_adapter_online = 0;
        }
 
        kfree(go->boot_fw);