[PATCH 3/5] [media] pwc-if: fix build warning when !CONFIG_USB_PWC_INPUT_EVDEV

[Luis Henriques]

Label err_video_unreg in function usb_pwc_probe() is only used when
CONFIG_USB_PWC_INPUT_EVDEV is defined.

drivers/media/usb/pwc/pwc-if.c:1104:1: warning: label 'err_video_unreg' defined 
but not used [-Wunused-label]

Signed-off-by: Luis Henriques <luis.henriq...@canonical.com>
---
 drivers/media/usb/pwc/pwc-if.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index 15b754da4a2c..e6b7e63b0b8e 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -1078,7 +1078,8 @@ static int usb_pwc_probe(struct usb_interface *intf, 
const struct usb_device_id
        pdev->button_dev = input_allocate_device();
        if (!pdev->button_dev) {
                rc = -ENOMEM;
-               goto err_video_unreg;
+               video_unregister_device(&pdev->vdev);
+               goto err_unregister_v4l2_dev;
        }
 
        usb_make_path(udev, pdev->button_phys, sizeof(pdev->button_phys));
@@ -1095,14 +1096,13 @@ static int usb_pwc_probe(struct usb_interface *intf, 
const struct usb_device_id
        if (rc) {
                input_free_device(pdev->button_dev);
                pdev->button_dev = NULL;
-               goto err_video_unreg;
+               video_unregister_device(&pdev->vdev);
+               goto err_unregister_v4l2_dev;
        }
 #endif
 
        return 0;
 
-err_video_unreg:
-       video_unregister_device(&pdev->vdev);
 err_unregister_v4l2_dev:
        v4l2_device_unregister(&pdev->v4l2_dev);
 err_free_controls:
-- 
2.1.0
--
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