]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pwc: hide unused label
authorArnd Bergmann <arnd@arndb.de>
Tue, 26 Jan 2016 16:17:24 +0000 (14:17 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Feb 2018 10:03:45 +0000 (11:03 +0100)
commit 1f6bcd011464cb36059e2562f72baf75f98b732d upstream.

The pwc driver causes a warning when CONFIG_USB_PWC_INPUT_EVDEV is unset:

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

This moves the unused label and code inside another #ifdef to
get rid of the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/usb/pwc/pwc-if.c

index 58f23bcfe94ecc01966d746269c42049aa30d143..299750e569166dcd44bcf82f4de907fd07c965c6 100644 (file)
@@ -1119,8 +1119,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
 
        return 0;
 
+#ifdef CONFIG_USB_PWC_INPUT_EVDEV
 err_video_unreg:
        video_unregister_device(&pdev->vdev);
+#endif
 err_unregister_v4l2_dev:
        v4l2_device_unregister(&pdev->v4l2_dev);
 err_free_controls: