[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <8fe337d5-c399-4546-b784-33e651ab608d@redhat.com>
Date: Mon, 26 May 2025 15:21:37 +0200
From: Hans de Goede <hdegoede@...hat.com>
To: Ricardo Ribalda <ribalda@...omium.org>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] media: uvcvideo: Populate all errors in uvc_probe()
Hi,
On 23-May-25 16:28, Ricardo Ribalda wrote:
> Now we are replacing most of the error codes with -ENODEV.
> Instead, Populate the error code from the functions called by
> uvc_probe().
>
> Take this opportunity to replace a generic error code from
> uvc_scan_device() into something more meaningful.
>
> Suggested-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
> Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hansg@...nel.org>
I have merged this into:
https://gitlab.freedesktop.org/linux-media/users/uvc/-/commits/next/
now.
Regards,
Hans
> ---
> CodeStyle and refactor patches after the last uvc Pull Request.
> ---
> Changes in v2:
> - Patches 1-3 will be handled by Laurent: https://lore.kernel.org/linux-media/20250523125840.GG12514@pendragon.ideasonboard.com/
> - Properly propagate ret value. Sorry about that :)
> - Link to v1: https://lore.kernel.org/r/20250509-uvc-followup-v1-0-73bcde30d2b5@chromium.org
> ---
> drivers/media/usb/uvc/uvc_driver.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index da24a655ab68cc0957762f2b67387677c22224d1..04552da114354128b0cc8fb25e1cc645498ac323 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -1866,7 +1866,7 @@ static int uvc_scan_device(struct uvc_device *dev)
>
> if (list_empty(&dev->chains)) {
> dev_info(&dev->udev->dev, "No valid video chain found.\n");
> - return -1;
> + return -ENODEV;
> }
>
> /* Add GPIO entity to the first chain. */
> @@ -2239,7 +2239,6 @@ static int uvc_probe(struct usb_interface *intf,
> /* Parse the Video Class control descriptor. */
> ret = uvc_parse_control(dev);
> if (ret < 0) {
> - ret = -ENODEV;
> uvc_dbg(dev, PROBE, "Unable to parse UVC descriptors\n");
> goto error;
> }
> @@ -2275,22 +2274,19 @@ static int uvc_probe(struct usb_interface *intf,
> goto error;
>
> /* Scan the device for video chains. */
> - if (uvc_scan_device(dev) < 0) {
> - ret = -ENODEV;
> + ret = uvc_scan_device(dev);
> + if (ret < 0)
> goto error;
> - }
>
> /* Initialize controls. */
> - if (uvc_ctrl_init_device(dev) < 0) {
> - ret = -ENODEV;
> + ret = uvc_ctrl_init_device(dev);
> + if (ret < 0)
> goto error;
> - }
>
> /* Register video device nodes. */
> - if (uvc_register_chains(dev) < 0) {
> - ret = -ENODEV;
> + ret = uvc_register_chains(dev);
> + if (ret < 0)
> goto error;
> - }
>
> #ifdef CONFIG_MEDIA_CONTROLLER
> /* Register the media device node */
>
> ---
> base-commit: 5e1ff2314797bf53636468a97719a8222deca9ae
> change-id: 20250509-uvc-followup-d97ff563df95
>
> Best regards,
Powered by blists - more mailing lists