pwc-if: fix build warning when !CONFIG_USB_PWC_INPUT_EVDEV

PATCH In review Luis Henriques 2 participants 2 messages Oct 1, 2014 – Jan 15, 2015

Subsystems (2)

Media (V4L/DVB) Pwc webcam driver

lore

Share & tools

lore

Luis Henriques

author

2014-10-01 23:10 UTC #0 lore raw

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

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 <[email protected]>

---
 drivers/media/usb/pwc/pwc-if.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/media/usb/pwc/pwc-if.c +4 -4

index 15b754da4a2c..e6b7e63b0b8e 100644
@@ -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:

Signature · 1 line

2.1.0

Hans de Goede

2015-01-15 10:40 UTC #1 lore raw

Hi,

Quoted 6 lines · 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 <[email protected]>

Sorry for the slow reaction, I somehow missed this patch and just found it in my patchwork TODO.

I understand what you're trying to achieve here, but NAK to the implementation, this is breaking the code flow wrt error handling, making it much harder to double check that everything is being cleaned up properly.

Regards,

Hans

Quoted 37 lines

---
drivers/media/usb/pwc/pwc-if.c | 8 ++++----

  1 file changed, 4 insertions(+), 4 deletions(-)

drivers/media/usb/pwc/pwc-if.c +4 -4

index 15b754da4a2c..e6b7e63b0b8e 100644
@@ -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: