rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / drivers / media / usb / hdpvr / hdpvr-core.c

diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index 77d7b7fbdc7e1ba0a62ca7dceb7e4cc903c28744..8247c19d62603cd4fbf977f010e28ea92ba6b045 100644 (file)
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -311,11 +311,6 @@ static int hdpvr_probe(struct usb_interface *interface,
 
        dev->workqueue = 0;
 
-       /* init video transfer queues first of all */
-       /* to prevent oops in hdpvr_delete() on error paths */
-       INIT_LIST_HEAD(&dev->free_buff_list);
-       INIT_LIST_HEAD(&dev->rec_buff_list);
-
        /* register v4l2_device early so it can be used for printks */
        if (v4l2_device_register(&interface->dev, &dev->v4l2_dev)) {
                dev_err(&interface->dev, "v4l2_device_register failed\n");
@@ -338,6 +333,10 @@ static int hdpvr_probe(struct usb_interface *interface,
        if (!dev->workqueue)
                goto error;
 
+       /* init video transfer queues */
+       INIT_LIST_HEAD(&dev->free_buff_list);
+       INIT_LIST_HEAD(&dev->rec_buff_list);
+
        dev->options = hdpvr_default_options;
 
        if (default_video_input < HDPVR_VIDEO_INPUTS)
@@ -414,7 +413,7 @@ static int hdpvr_probe(struct usb_interface *interface,
                                    video_nr[atomic_inc_return(&dev_nr)]);
        if (retval < 0) {
                v4l2_err(&dev->v4l2_dev, "registering videodev failed\n");
-               goto reg_fail;
+               goto error;
        }
 
        /* let the user know what node this device is now attached to */