From: Mauro Carvalho Chehab <m.che...@samsung.com>

As V4L2 registration now occurs asynchronously, the code doesn't
fail there anymore.

Signed-off-by: Mauro Carvalho Chehab <m.che...@samsung.com>
---
 drivers/media/usb/em28xx/em28xx-cards.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c 
b/drivers/media/usb/em28xx/em28xx-cards.c
index 4fccbed539f9..d1c75e66554c 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2972,7 +2972,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct 
usb_device *udev,
        if (retval < 0) {
                em28xx_errdev("%s: em28xx_i2c_register bus 0 - error [%d]!\n",
                        __func__, retval);
-               goto unregister_dev;
+               return retval;
        }
 
        /* register i2c bus 1 */
@@ -2986,7 +2986,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct 
usb_device *udev,
                if (retval < 0) {
                        em28xx_errdev("%s: em28xx_i2c_register bus 1 - error 
[%d]!\n",
                                __func__, retval);
-                       goto unregister_dev;
+                       return retval;
                }
        }
 
@@ -2994,16 +2994,6 @@ static int em28xx_init_dev(struct em28xx *dev, struct 
usb_device *udev,
        em28xx_card_setup(dev);
 
        return 0;
-
-       if (dev->def_i2c_bus)
-               em28xx_i2c_unregister(dev, 1);
-       em28xx_i2c_unregister(dev, 0);
-       v4l2_ctrl_handler_free(&dev->ctrl_handler);
-
-unregister_dev:
-       v4l2_device_unregister(&dev->v4l2_dev);
-
-       return retval;
 }
 
 /* high bandwidth multiplier, as encoded in highspeed endpoint descriptors */
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to