diff mbox series

回复: [PATCH] usb: gadget: uvc: Fix the wrong v4l2_device_unregister call

Message ID BYAPR11MB26322AE0FCD63AEB467D3AE3FF350@BYAPR11MB2632.namprd11.prod.outlook.com
State New
Headers show
Series 回复: [PATCH] usb: gadget: uvc: Fix the wrong v4l2_device_unregister call | expand

Commit Message

Zhang, Qiang Sept. 28, 2020, 6:31 a.m. UTC 
Cc: Alan Stern
diff mbox series

Patch

diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index 0b9712616455..44b4352a2676 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -740,20 +740,20 @@  uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
        /* Initialise video. */
        ret = uvcg_video_init(&uvc->video, uvc);
        if (ret < 0)
-               goto error;
+               goto v4l2_error;

        /* Register a V4L2 device. */
        ret = uvc_register_video(uvc);
        if (ret < 0) {
                uvcg_err(f, "failed to register video device\n");
-               goto error;
+               goto v4l2_error;
        }

        return 0;

-error:
+v4l2_error:
        v4l2_device_unregister(&uvc->v4l2_dev);
-
+error:
        if (uvc->control_req)
                usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);
        kfree(uvc->control_buf);