| Message ID | 1453817424-3080054-1-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Arnd,
[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on v4.5-rc1 next-20160125]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Arnd-Bergmann/pwc-hide-unused-label/20160126-221727
base: git://linuxtv.org/media_tree.git master
config: xtensa-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=xtensa
All errors (new ones prefixed by >>):
drivers/media/usb/pwc/pwc-if.c: In function 'usb_pwc_probe':
>> drivers/media/usb/pwc/pwc-if.c:1092:3: error: label 'err_video_unreg' used but not defined
goto err_video_unreg;
^
vim +/err_video_unreg +1092 drivers/media/usb/pwc/pwc-if.c
479567ce3 drivers/media/video/pwc/pwc-if.c Hans Verkuil 2010-09-12 1086
e32a7eccd drivers/media/video/pwc/pwc-if.c Nam Ph?m Thành 2009-01-12 1087 #ifdef CONFIG_USB_PWC_INPUT_EVDEV
e32a7eccd drivers/media/video/pwc/pwc-if.c Nam Ph?m Thành 2009-01-12 1088 /* register webcam snapshot button input device */
e32a7eccd drivers/media/video/pwc/pwc-if.c Nam Ph?m Thành 2009-01-12 1089 pdev->button_dev = input_allocate_device();
e32a7eccd drivers/media/video/pwc/pwc-if.c Nam Ph?m Thành 2009-01-12 1090 if (!pdev->button_dev) {
89dec01b7 drivers/media/video/pwc/pwc-if.c Dmitry Torokhov 2009-08-14 1091 rc = -ENOMEM;
89dec01b7 drivers/media/video/pwc/pwc-if.c Dmitry Torokhov 2009-08-14 @1092 goto err_video_unreg;
e32a7eccd drivers/media/video/pwc/pwc-if.c Nam Ph?m Thành 2009-01-12 1093 }
e32a7eccd drivers/media/video/pwc/pwc-if.c Nam Ph?m Thành 2009-01-12 1094
89dec01b7 drivers/media/video/pwc/pwc-if.c Dmitry Torokhov 2009-08-14 1095 usb_make_path(udev, pdev->button_phys, sizeof(pdev->button_phys));
:::::: The code at line 1092 was first introduced by commit
:::::: 89dec01b7e251697720ac3d6a5310d72359eba69 V4L/DVB (12489): pwc - fix few use-after-free and memory leaks
:::::: TO: Dmitry Torokhov <dmitry.torokhov@gmail.com>
:::::: CC: Mauro Carvalho Chehab <mchehab@redhat.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Tuesday 26 January 2016 15:09:55 Arnd Bergmann wrote: > 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] > > Obviously, the cleanup of &pdev->vdev is not needed without the input device, > so we can just move it inside of the existing #ifdef and remove the > extra label. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Please ignore patch 1. I made some late changes and failed to noticed the build failure I introduced in another configuration. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index 086cf1c7bd7d..bdd416af84c7 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c @@ -1106,14 +1106,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:
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] Obviously, the cleanup of &pdev->vdev is not needed without the input device, so we can just move it inside of the existing #ifdef and remove the extra label. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/media/usb/pwc/pwc-if.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)