From nobody Sun Dec 14 19:21:37 2025 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 6E0772951BC for ; Fri, 23 May 2025 14:28:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748010526; cv=none; b=Wv4NUGwY4twqEX/EJFtdMfQjWkDGKwtTx0zXKtewvP6pWdao3oiZANvVLdtGm3x04sz8cYvfkRZVFZKiFU2ak4nBiI/luWDEWLkbkhWu6dy2XDNoM8NlVfPnSqPYPxX6q0g+omkoic7F81ZXOewMnWhIilE+WkJ/gKhTplWd1JY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748010526; c=relaxed/simple; bh=a2TDZ2q/7uNti2V57OlYau145NB4eR13OsEIBn0U4gA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=kc9ZQVcN4gDUehbGHWe1PFVo+vdxj2XnSCKGqtn9OZmCaKeVftGcd/kQVO/KyJgrNYQG99G3zNVU/MeDFgWjrGn3wTCzSQh2iWFa8X6VfrNuk3wEApEzskTDbQiJNrAKfdS2cz6k/lZ6vXCF7J33YVhvZxTRQPs7f7xrqBtlhB4= 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=B2SRNaCS; arc=none smtp.client-ip=209.85.167.46 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="B2SRNaCS" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-551fe46934eso1117999e87.1 for ; Fri, 23 May 2025 07:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1748010522; x=1748615322; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=Iw0TCyt07qCHVss0tlxpT1VU8Sfr9QBlaolFbQV/mVU=; b=B2SRNaCSKyyKEZJ1UPGQXvduY2oxpVWCQr4r9vP3xmlXZmfohiKV41WSjQ/lf49TVH URyKbYQR/3Mb1s0gkukNsf5H5nrV9XLGxSBWKnKmRTp/sGnrI7mPtrEB6SYFL8i9DVoM D/2drHtyEUwq2HmBbtzhnW/8moIlPB2bsPdlk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748010522; x=1748615322; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Iw0TCyt07qCHVss0tlxpT1VU8Sfr9QBlaolFbQV/mVU=; b=P1aoRlst0p7uDeQraiV8K512GBHlTlC67CIN7HQjQwO9LnuSkfaJ90WAA5WK+UIeu4 JlxEy4bFw33S6f7uR0pwynIgD3uXe1fSJCwec+VOLG5xwHiTqGNEbp6/X5Xz4rLaKsLO +unhmXVvGT3QyJEGXZn5vXeFmcSrbga663R9EQKAIEhEuxEfeNWuCPAKW3lRN0pikDJS n6GnksOzfe8hlRAgCSpIg7yNnV7MkwqrP8wZm6IDyOM1/Z3QNv8DND3J3qX3b3gpVI6d NyZfQ8BYHjXJGEqZpvzwV4YA4Lp0Ahy7uFb9rY5uif+GGuRm3YdhdNuR17ryunE03Xgk yFvw== X-Forwarded-Encrypted: i=1; AJvYcCUABbmyCafEAcbIN9jgDo0HUu1xWk1memKiiiH2eUL3rYlSHC9ZxCQCi8skQzJbj8DkNwy6TiDxtRrW+nE=@vger.kernel.org X-Gm-Message-State: AOJu0YzcnLEbxviwTlZpKdR937b+cAUUSnmPC2wx0oz7ucmMHZ/BDzRx bbcR2RNLEchu9bDurU50yIQyZd51hwcHO51+4ivSDN2a1pMXL5MsIdL6Ed4QQz78Gw== X-Gm-Gg: ASbGncu5uUYR6RFG/szwZsEc2UbaaBgxxjD8hI/ileOpvypGiYVm0VEkJbAHz9HtOTy Ha0zwp9SnL7M24L+tPutO5O9FomkTjCclACrnX61dERY3nR5XFX3d0770b0RrhtnRosFVXKy5RJ pyVf7UVmqND2l3GhuVcYBgMZHXS6DoshBzPQvZaempThGg2ZePJgdtpLlycOL97NvG2o9NPZuNR BC9kxDtT69445QjykUtFd/GeOBy12INFS3kZBP2H5y0OKpjSNFA4OrHE8CnnS6plwiMwHLgcKC1 uUcmpG6GdkNVJWiYAnt9aqSvKpUY8OUE509WT9Uv9XexK/9Y7B1L6DakUsy+4Vv1C7wIZETrFWm B384xIOVDCR3TFkzd7Hi3w9MERg== X-Google-Smtp-Source: AGHT+IEBZg7xrIchOcxBtUlwk2C3pGpQWWzzOxVC3QlFAe5yveXxpUNg2ZCRPGvVTd0hCvw0OsJVIQ== X-Received: by 2002:a05:6512:3054:b0:549:88b8:ccad with SMTP id 2adb3069b0e04-552156bbd11mr1215091e87.20.1748010522389; Fri, 23 May 2025 07:28:42 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-551fc7d8a4bsm1952590e87.115.2025.05.23.07.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 May 2025 07:28:42 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 23 May 2025 14:28:41 +0000 Subject: [PATCH v2] media: uvcvideo: Populate all errors in uvc_probe() 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: <20250523-uvc-followup-v2-1-487541656e83@chromium.org> X-B4-Tracking: v=1; b=H4sIABiGMGgC/3XMSw7CIBSF4a00dyyGQrCpI/dhOrA8yk3a0lwEN Q17Fzt3+J/kfDtES2gjXJsdyGaMGNYa4tSA9o91sgxNbRBcKK54z1LWzIV5Dq+0MdN3zqmLNK5 XUC8bWYfvg7sPtT3GZ6DPoef2t/6Bcss46+SojZXciFHdtKewYFrOgSYYSilfYHDKkKsAAAA= X-Change-ID: 20250509-uvc-followup-d97ff563df95 To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 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 Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede Reviewed-by: Laurent Pinchart --- 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-med= ia/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-73bcde30= d2b5@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..04552da114354128b0cc8fb25e1= cc645498ac323 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) =20 if (list_empty(&dev->chains)) { dev_info(&dev->udev->dev, "No valid video chain found.\n"); - return -1; + return -ENODEV; } =20 /* 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 =3D uvc_parse_control(dev); if (ret < 0) { - ret =3D -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; =20 /* Scan the device for video chains. */ - if (uvc_scan_device(dev) < 0) { - ret =3D -ENODEV; + ret =3D uvc_scan_device(dev); + if (ret < 0) goto error; - } =20 /* Initialize controls. */ - if (uvc_ctrl_init_device(dev) < 0) { - ret =3D -ENODEV; + ret =3D uvc_ctrl_init_device(dev); + if (ret < 0) goto error; - } =20 /* Register video device nodes. */ - if (uvc_register_chains(dev) < 0) { - ret =3D -ENODEV; + ret =3D uvc_register_chains(dev); + if (ret < 0) goto error; - } =20 #ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device node */ --- base-commit: 5e1ff2314797bf53636468a97719a8222deca9ae change-id: 20250509-uvc-followup-d97ff563df95 Best regards, --=20 Ricardo Ribalda