From 981f02acffa92bc6ebe25b6e0cca3442c0df3707 Mon Sep 17 00:00:00 2001 From: bachnxuan Date: Fri, 28 Feb 2025 23:07:21 +0700 Subject: [PATCH] fixup! --- drivers/Kconfig | 2 +- drivers/usb/gadget/function/f_uvc.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/Kconfig b/drivers/Kconfig index fa88a4cef09c..fd41864bc218 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -241,4 +241,4 @@ source "drivers/most/Kconfig" source "drivers/kernelsu/Kconfig" source "drivers/p73-spi/Kconfig" - +endmenu diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 3880af3ba7e4..f711d03bcf49 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -290,7 +290,6 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) v4l2_event_queue(&uvc->vdev, &v4l2_event); } ->>>>>>> 9586237b6ff6 (FROMLIST: usb: gadget: uvc: enqueue usb request in setup handler for control OUT) return 0; }