From nobody Sun Feb 8 13:33:03 2026 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C767422F17B for ; Mon, 3 Mar 2025 19:07:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741028837; cv=none; b=LCSTp8+CJRtJlZ7WpnVBHU+nI5VQy3bHXCJTm6etXmBUr8uSIAhRruygTOAzsehNuO0oQHOqPSRCvVpkIoGlDR6rmzAGu0V0jGseQer2/zPXDixhfZowy2vt9rFYdeTN5FlIPEzIH04y4gZ4ao1i8uoR6Vi/l/9fF/gaRKyuZBQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741028837; c=relaxed/simple; bh=zwKv15o7Jo/9fgFeCeS3GYugU2qgxl7huykM3V6apSc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FCQGCVOQ5d2GZiiKyzSOTuHgOTGGxrsdm6coO7SoYVACIZDR+55WfUTYzOwdZ7IpNuPa0eWrLa3/SBKRzrD9folbZJMhu8DpuXgCmp8xQSKMo9XyfQh+UhQUkFfMT1oGi5nPyjdgEw3Vcwkcd7pFAzUo8xQ+XlJ9+jyiU4Kaz6o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=SW4UHc+V; arc=none smtp.client-ip=209.85.160.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="SW4UHc+V" Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-4720cfc35e9so78230721cf.2 for ; Mon, 03 Mar 2025 11:07:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741028833; x=1741633633; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=a8Gxk9vB5xla0tvwCl8Ds7W2l2MwxkkWMXQxVGtphCo=; b=SW4UHc+VNeQadA0BI0YXHxoHnIzwokI2ZDq80cev7H/Y7t6MdxTtJaXjy4m5qyiOSA 1Sex0aJarUpORl75xVe97ao4T6T97bHrawc63MMA+2C0/TCB/0yPhheBuyCIr1pO1M+B +oYWFhBU6d0oITBxUUohKopCb/ZaNQTMRvHj8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741028833; x=1741633633; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a8Gxk9vB5xla0tvwCl8Ds7W2l2MwxkkWMXQxVGtphCo=; b=h2lFqWoPzvIb5y2MT+ptD2gobuLn06QK+pfCIQvSQWvjPYhvDhQfiKyIMDw0vZ5df2 F2Zq8ghAglWNC/K3EIuMDBEMJ37tF9zvy0olbOEUkWHVKWgoc8FxcmH9yQJTE8MAY3Yh pMVOoOIC8HEnifKy6SkaV4F9bmN9PH0ddKmlysJS1gkcnDZd1OtY+06kIL5ic1QN36R1 XyiN5Z0pJE45Ofg54ZgpSZzagAZNO/niFMyiI0CBQ5tM+5vKS/OguvtqegqEIppDAimM e1Pg4CH5kpaqDSPJDAxJzf9pEKVlSf/0cSl4YhRY1owx1ThE0aJT69zdvjX5NE2SoccU 28/g== X-Forwarded-Encrypted: i=1; AJvYcCWC8wJABp3XNiOYyDhyXLEXuKZY84uGBiQEDub1mo3T94La3aIxuydNdtanUF0o622F96tICxxdUgMMRBs=@vger.kernel.org X-Gm-Message-State: AOJu0YxF9XKUQFeL9I2UWN1ph41nbQw0ed3mYTfdpxaoSqDpp7f2D5JP Wf6Bjkkc9SRZj5d/ILWb1GNSud5exP+CkrVEUnNA2VM6Qj9dTEvv8rZYMWs//Q== X-Gm-Gg: ASbGnctJ3ZUaNZ8zgOPxK9B1BLiH0PQyYjKRGA81OxBHj6odIQYIt3Ur7pXAceiQAc4 QR4nsB9RK9QayAIGXv2KB+u/QcH0LsT3QZHED0LAxCWxIkWqFOdIUa7fLFP1Qs2c6Mhn/GPriLw 4SmK7sJrWc00vieoD9MWOvMOnE/HbjqCR8uhu3lZPey7zXm6VqGc6UbRQhwkwjKJ2bjbgdfitYr Aq0+GHQmZ02xxQP/8wyBmIrH106QjJq7WMvBfF4U4A1zGM8RNRmm2LQobsDtLx4EFSDzRop4KPF LPMLOZZBtcWF6Iv7z05QrzNcUMLFSYnN0PB5jzHBu5wnA99zZv3AXo3P48OHwZuBi77ZxKn2d3o aqco8yoVduYbMeoWufdtMdA== X-Google-Smtp-Source: AGHT+IHNtHwExEby6G65UwGqmP6x3/NpxGPVOKVUd7HVUEskMl+/Yh0StRkgXpJdIyW8qdJRBCX/Ug== X-Received: by 2002:a05:622a:152:b0:471:f539:481c with SMTP id d75a77b69052e-474bc0f6308mr195158551cf.39.1741028833678; Mon, 03 Mar 2025 11:07:13 -0800 (PST) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-474f1b76856sm10218651cf.16.2025.03.03.11.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Mar 2025 11:07:13 -0800 (PST) From: Ricardo Ribalda Date: Mon, 03 Mar 2025 19:07:08 +0000 Subject: [PATCH v2 1/2] media: uvcvideo: Fix deferred probing error Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250303-uvc-eprobedefer-v2-1-be7c987cc3ca@chromium.org> References: <20250303-uvc-eprobedefer-v2-0-be7c987cc3ca@chromium.org> In-Reply-To: <20250303-uvc-eprobedefer-v2-0-be7c987cc3ca@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org, Douglas Anderson X-Mailer: b4 0.14.1 uvc_gpio_parse() can return -EPROBE_DEFER when the GPIOs it depends on have not yet been probed. This return code should be propagated to the caller of uvc_probe() to ensure that probing is retried when the required GPIOs become available. Currently, this error code is incorrectly converted to -ENODEV, causing some internal cameras to be ignored. This commit fixes this issue by propagating the -EPROBE_DEFER error. Cc: stable@vger.kernel.org Fixes: 2886477ff987 ("media: uvcvideo: Implement UVC_EXT_GPIO_UNIT") Reviewed-by: Douglas Anderson Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index deadbcea5e22..e966bdb9239f 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2231,13 +2231,16 @@ static int uvc_probe(struct usb_interface *intf, #endif =20 /* Parse the Video Class control descriptor. */ - if (uvc_parse_control(dev) < 0) { + ret =3D uvc_parse_control(dev); + if (ret < 0) { + ret =3D -ENODEV; uvc_dbg(dev, PROBE, "Unable to parse UVC descriptors\n"); goto error; } =20 /* Parse the associated GPIOs. */ - if (uvc_gpio_parse(dev) < 0) { + ret =3D uvc_gpio_parse(dev); + if (ret < 0) { uvc_dbg(dev, PROBE, "Unable to parse UVC GPIOs\n"); goto error; } @@ -2263,24 +2266,32 @@ static int uvc_probe(struct usb_interface *intf, } =20 /* Register the V4L2 device. */ - if (v4l2_device_register(&intf->dev, &dev->vdev) < 0) + ret =3D v4l2_device_register(&intf->dev, &dev->vdev); + if (ret < 0) goto error; =20 /* Scan the device for video chains. */ - if (uvc_scan_device(dev) < 0) + if (uvc_scan_device(dev) < 0) { + ret =3D -ENODEV; goto error; + } =20 /* Initialize controls. */ - if (uvc_ctrl_init_device(dev) < 0) + if (uvc_ctrl_init_device(dev) < 0) { + ret =3D -ENODEV; goto error; + } =20 /* Register video device nodes. */ - if (uvc_register_chains(dev) < 0) + if (uvc_register_chains(dev) < 0) { + ret =3D -ENODEV; goto error; + } =20 #ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device node */ - if (media_device_register(&dev->mdev) < 0) + ret =3D media_device_register(&dev->mdev); + if (ret < 0) goto error; #endif /* Save our data pointer in the interface data. */ @@ -2314,7 +2325,7 @@ static int uvc_probe(struct usb_interface *intf, error: uvc_unregister_video(dev); kref_put(&dev->ref, uvc_delete); - return -ENODEV; + return ret; } =20 static void uvc_disconnect(struct usb_interface *intf) --=20 2.48.1.711.g2feabab25a-goog From nobody Sun Feb 8 13:33:03 2026 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45796231CB9 for ; Mon, 3 Mar 2025 19:07:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741028840; cv=none; b=r2CRPdCeD3GhMY3nKZbej8QCO5u7/Dcjk9nNdYlWFz08XwcU6t5U1sylt6brigNgBqyF+eSoW56Vld1Js7R5+pOpQ5ahJwlE549Bb9VtQ5BcQWUXYD7NSUm9mnwq4qGPUZiQFGiI/W5SmiLC9hmfb6+nhYQlk7OBE9et2U6I0BM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741028840; c=relaxed/simple; bh=727RL/vy1smD0AJDbCjmRvd1a1o2D/6943w37oDoA8Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E0mTc/WXOK1WxUNtoQaWgtWKOkJqwzINk3+xTtDX0yonK+6gHIllvs2F4x8pyfLB25zU5yV94kEM1bSB9A38F4qA3p0ZXoJCt2EvP0lLIl6L8HwLWWYWEJ5eZ9tdD33a7r/Mh+9Hd1F8ATtjl05MkSk13OTd2LbjVUMwPHK/Mh0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=IgLiRlUq; arc=none smtp.client-ip=209.85.160.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="IgLiRlUq" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-474eca99f9bso18447081cf.3 for ; Mon, 03 Mar 2025 11:07:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741028835; x=1741633635; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ZZwQUn/XlYg8B1gU2t/0mo4nCO2lMeP4D6FyqvnakfU=; b=IgLiRlUqFdj+Xe6BrIOuDEPp1ifXdeLCIO4SE7jmB+5CB6c4XjtiNYG/B5XkDzlfIz tt37qcdaMEqPh6s4XyfYkLthB20ATIKzRVy2UOI0gpPRUpNY6PlvJRSMOQf+YqS3zAeo g6ZFmom0+dyhSFphyROYz5ieiUzOjK+7QwGcY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741028835; x=1741633635; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZZwQUn/XlYg8B1gU2t/0mo4nCO2lMeP4D6FyqvnakfU=; b=IYxoxKd2eqSTLHk8nH03fmzE36sl+4SW7ypRXAOhSAMWpR/cFpK+ZvwDfK6DH8FnQ7 ElaJBL9JU4VFgptgsoIxuzmSvu8iYOL0SIkiD+PHEp2k5NWewOL1AVBbIukfz7B9l+Iq i1VPc+GtxpijpFwlJgN2Odmsw1p2chq2rMqhfsNdAxMJ30Q47eN6WGUq2x6iq2rq0blQ p/rtr9cHu18kGslOf+VkywW+DSF7dyAqDXNqzESJ5Dss9JyBRO5uxzZeJgUROunUcAs2 NHZ3KqQ67rchTfDsyirTgo4gDtfYhU3aVca4Zyrai4OogJl13AMmHH7hDdbodBanK5xf YjcA== X-Forwarded-Encrypted: i=1; AJvYcCUblGMTFA+k/td9JeUwGsmDd9M11CzVxVWEQNj22iYsuEGkLhcDRws4DJfjjyYbevgBcDC/ULVZJfQcPfA=@vger.kernel.org X-Gm-Message-State: AOJu0Yzh0xj/yO3s+34MbYhthEd/uaAYLb5EKXCW1EWM0XOc71soApBh u/bllIMxRasAmipY26vz1bcfR+ONUDXy+WAKUHxjZymt7jBjM+Spl1SIyK8kEg== X-Gm-Gg: ASbGncvp4yC3NaNH8Z1otXTVF+MEclp0E8VRL5vNisUkHaKeWDwdh/6/5YJajawktZe wKp4hyVwToEJh2WKZNJvYLWGz17PZxtoWU1tYb6dg7P6NNV8++bfas+K2EXzZdfgL9V9iF6/W7f oVbal14qoR+vztvG5+KHs1BCymYE+liUpa2iVH1QzRXVZAp27NBxcNz/OV2nuoDqKr6CONZN3Gi bq4usPyUTyf+zD0FvCDHxxwbwYR/hnbrH9QjW2DLOpQCwHD753XKV5iJz+KiW8OiYBKzMcmL+Nc 794h1KFINpGzFk098GuEemFzZ7iL07nyAW4FDMPbeOGIusk52gzB10pfqh6R1AyOsq+OEHmjwBL LofkYsnrcOy+10ARFzXSRdw== X-Google-Smtp-Source: AGHT+IHbB2ULThZDwvr8LwWiOxMeoRP6M+8CIeBuTRWBxSc7Hsd2Skry93C67PBKQasajm2/AaIqQw== X-Received: by 2002:a05:622a:610c:b0:474:bca3:85c1 with SMTP id d75a77b69052e-474bca38813mr202403531cf.8.1741028835091; Mon, 03 Mar 2025 11:07:15 -0800 (PST) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-474f1b76856sm10218651cf.16.2025.03.03.11.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Mar 2025 11:07:13 -0800 (PST) From: Ricardo Ribalda Date: Mon, 03 Mar 2025 19:07:09 +0000 Subject: [PATCH v2 2/2] media: uvcvideo: Use dev_err_probe for devm_gpiod_get_optional Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250303-uvc-eprobedefer-v2-2-be7c987cc3ca@chromium.org> References: <20250303-uvc-eprobedefer-v2-0-be7c987cc3ca@chromium.org> In-Reply-To: <20250303-uvc-eprobedefer-v2-0-be7c987cc3ca@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , Doug Anderson X-Mailer: b4 0.14.1 Use the dev_err_probe() helper for devm_gpiod_get_optional(), like we do with gpiod_to_irq() That eventually calls device_set_deferred_probe_reason() which can be helpful for tracking down problems. Suggested-by: Doug Anderson Signed-off-by: Ricardo Ribalda Reviewed-by: Douglas Anderson --- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index e966bdb9239f..0094cfc092d6 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1297,8 +1297,13 @@ static int uvc_gpio_parse(struct uvc_device *dev) =20 gpio_privacy =3D devm_gpiod_get_optional(&dev->intf->dev, "privacy", GPIOD_IN); - if (IS_ERR_OR_NULL(gpio_privacy)) - return PTR_ERR_OR_ZERO(gpio_privacy); + if (!gpio_privacy) + return 0; + + if (IS_ERR(gpio_privacy)) + return dev_err_probe(&dev->intf->dev, + PTR_ERR(gpio_privacy), + "Can't get privacy GPIO\n"); =20 irq =3D gpiod_to_irq(gpio_privacy); if (irq < 0) --=20 2.48.1.711.g2feabab25a-goog