]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: uvcvideo: Reorder uvc_status_init()
authorRicardo Ribalda <ribalda@chromium.org>
Tue, 22 Oct 2024 08:37:13 +0000 (08:37 +0000)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 19 Dec 2024 14:44:43 +0000 (14:44 +0000)
Only initialize the input device if the interrupt endpoint has been
properly initialized.

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20241022-order_status-v1-1-3904fafca340@chromium.org
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/usb/uvc/uvc_status.c

index 06c867510c8fe6d051c7814586796700339c3316..02c90acf696472210f7f511b75d229e8840a6780 100644 (file)
@@ -262,8 +262,6 @@ int uvc_status_init(struct uvc_device *dev)
        if (ep == NULL)
                return 0;
 
-       uvc_input_init(dev);
-
        dev->status = kzalloc(sizeof(*dev->status), GFP_KERNEL);
        if (!dev->status)
                return -ENOMEM;
@@ -289,6 +287,8 @@ int uvc_status_init(struct uvc_device *dev)
                dev->status, sizeof(*dev->status), uvc_status_complete,
                dev, interval);
 
+       uvc_input_init(dev);
+
        return 0;
 }