Merge tag 'for-linus-20170825' of git://git.infradead.org/linux-mtd

[mirror_ubuntu-artful-kernel.git] / drivers / media / usb / em28xx / em28xx-i2c.c

diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
index 8c472d5adb5091985971eadb73e23f077fa45a77..60b195c157b807486bf87aa5a1b6ebd60e9754cc 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -982,8 +982,6 @@ int em28xx_i2c_register(struct em28xx *dev, unsigned bus,
                        dev_err(&dev->intf->dev,
                                "%s: em28xx_i2_eeprom failed! retval [%d]\n",
                                __func__, retval);
-
-                       return retval;
                }
        }