From patchwork Tue Oct 8 07:06:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13825767 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (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 87B801F9A93 for ; Tue, 8 Oct 2024 07:06:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728371182; cv=none; b=ESwVxODmhogsMZ0Zrrz8p07LqwvTPeubaFuSDGB2TTcza8mUOynHMxsHlnxgiIzAugGUWIF/p3s3u5ynsg2O9aPDG+dCbMgbiY/RnL0I5JtWvF0upTGpZvbfXDxMkazA6vXalOv2RpO/O2qIqrDot0Mvkuak/l3P/ZGJBMkVGYQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728371182; c=relaxed/simple; bh=t1pAvWaDC2XezFxZD6bG6re3WWY632E7aLxyVqoDOEo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D61UT7ILkGWNHVsRGcDLuJw3wx9JeXqN4mj6GS4pdWRYl3HZPNeVjZRzF3l6I216KUnbJbxiRc0om1KqXAPzdNYXdY65clTrjLBJzBGXVOGoNIzp8Qxk6uWwW2+HcGs2zgTBV/A/H+BW9nwMCXjbolhljmLTPDanKQpJaOS9DuI= 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=WfXFAQf5; arc=none smtp.client-ip=209.85.160.177 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="WfXFAQf5" Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-45cac3368f0so30362851cf.0 for ; Tue, 08 Oct 2024 00:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1728371179; x=1728975979; 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=jyYD6ArZVK45+VLwWpocZkjfjByfwzgnW1gPt6FS3DU=; b=WfXFAQf5MGJmroMzcHLYSZ/H/rnSfbJjzfb/qp5UUYvI4TL3bClGlIdCGkAL3otqLL s5KKw6IUctZOVa0RIiubE1Sy4Rwzxipgeev35ixIt/n7sEqEzXKugEngAkBqS2NuG+Ez oMRoM6HGEO61aMq4lB3iqutp1DlDZSjNOrodo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728371179; x=1728975979; 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=jyYD6ArZVK45+VLwWpocZkjfjByfwzgnW1gPt6FS3DU=; b=k/iMn3aEGwkdrTcHS/iXTvMc0s09lgiU8kDKiiJQfHLQzQcc1zkBeE7qMcOhKFrJXa 88H6sOHTKJ3ocypIqjtE21N5gG3vNxtOZI50e+26aGlfyVJkaZFXKQ3Xl5uhXKStkvz8 ZP8VWMU/GrjkMDKVAMXJ4kaUczLeVyFfDLnefn1w03Zes35oo1dVfxROpSVZfDAJfzGS 7a09b/oY97hB5f/aPCiZFfRC9BqWm0OyRKCdN8rl+9o02OrJyfZsfLSOzcMEqRoavRbo +RextP4+IOLPq31cP9eBljr0dKBh+uQVlI7nCs93miUFmXGldM6h0H+gcYg2IoBLu9BK fjFw== X-Gm-Message-State: AOJu0YzmWfQ5/dPb9QtJPMUYNbmz0nWDzoG2G5Kmf6mAmQ6HpxC8hCu2 RsKrJ9boWAVMDiW3QSLwhwjAh+aITbuslMTyeqwiONiKdJ4S44eVdCe9ry6M9w== X-Google-Smtp-Source: AGHT+IHAXauuu8Lhecqd4BHK9YWDTOCb8kDvv55sLtE3EDVAYcD3iHT0tlmCSPXjU48F5uQjczxp0w== X-Received: by 2002:a05:622a:19a9:b0:458:2b7b:c453 with SMTP id d75a77b69052e-45d9ba2f097mr224135731cf.4.1728371179383; Tue, 08 Oct 2024 00:06:19 -0700 (PDT) Received: from denia.c.googlers.com (76.224.245.35.bc.googleusercontent.com. [35.245.224.76]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45da764043esm33801921cf.88.2024.10.08.00.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 00:06:17 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 08 Oct 2024 07:06:14 +0000 Subject: [PATCH 1/3] media: uvcvideo: Support partial control reads Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241008-uvc-readless-v1-1-042ac4581f44@chromium.org> References: <20241008-uvc-readless-v1-0-042ac4581f44@chromium.org> In-Reply-To: <20241008-uvc-readless-v1-0-042ac4581f44@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org X-Mailer: b4 0.13.0 Some cameras, like the ELMO MX-P3, do not return all the bytes requested from a control if it can fit in less bytes. Eg: Returning 0xab instead of 0x00ab. usb 3-9: Failed to query (GET_DEF) UVC control 3 on unit 2: 1 (exp. 2). Extend the returned value from the camera and return it. Cc: stable@vger.kernel.org Fixes: a763b9fb58be ("media: uvcvideo: Do not return positive errors in uvc_query_ctrl()") Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index cd9c29532fb0..853dfb7b5f7b 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -79,11 +79,16 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, if (likely(ret == size)) return 0; + if (ret > 0 && ret < size) { + memset(data + ret, 0, size - ret); + return 0; + } + if (ret != -EPIPE) { dev_err(&dev->udev->dev, "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n", uvc_query_name(query), cs, unit, ret, size); - return ret < 0 ? ret : -EPIPE; + return ret ? ret : -EPIPE; } /* Reuse data[0] to request the error code. */ From patchwork Tue Oct 8 07:06:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13825768 Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) (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 D98C41FA255 for ; Tue, 8 Oct 2024 07:06:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728371184; cv=none; b=TQh/6bvZ3cHKolBjs5CKVUluuiuODg4a5rtkYBCxgMkBp67aC1Nc+eH++XJc/qBYqaeRA0krA5k4uXRgTVFYDJOvExGLNNmmxomPePmHIcl8QQCAPbzATuheiNgDv3kGCZemzAYPGOlj1x5kRtP0mJ2NYC0La9Lhc64RIY79s9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728371184; c=relaxed/simple; bh=npkZZo7HZp404cjl+XlR7zlTgrfhIHuTn3dDOSGYTbw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kPeitIVze/ywRSkJupQLxaEBJbkY5i556P+MGtv+TlsHgKN9y3oUHwwIZBI5EZ8wh7vNGCztFGPwADaa5G7qjvINYsarLTererb/Xe3U8yW+y0TlSUyQlF/fCcCAbN9Wrc4yrq2aFy9GQZ3RsEof4czagBNNqxPq41ioPb3ct0A= 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=GDxwj+ci; arc=none smtp.client-ip=209.85.160.176 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="GDxwj+ci" Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-45effbc3348so1678651cf.2 for ; Tue, 08 Oct 2024 00:06:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1728371182; x=1728975982; 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=/7J2ZIlNlOvxIZibX4IzDzB3bM7/Wb+XFb3DNRyUIUM=; b=GDxwj+ciELk+F50ciYUz5po8c8HD2wm8dmy79+LUjtgQQBdRejLdVtSBoL/i4kC9WP 3XeeP/u4DQuTclMdrV3N34TyAfAfPdTQhQ3UGggPZV6enJ73/D3Skl79nF5+ycwIdSyT DUa9uwhbH6J9k4VTnvVjSI4OBIj3owhmQK2e8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728371182; x=1728975982; 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=/7J2ZIlNlOvxIZibX4IzDzB3bM7/Wb+XFb3DNRyUIUM=; b=lokVYYCiLyxnctEgCmCzrBMAjIibA6MQ2XLlN8xKQgp3AJKxN85CjKFhmo4VJWQ4p3 PVmPaSCfLCOHZXxnpRJ2siWzHiq0U0ZoC8ZapgvyPOYSHmAt2qVpZZli7tCo3vFcHW+u RGLeeIR1CZMNrQChNWIIF08rGH8ResbM1qsJ+GkMoHdIDLHbqkxG9YuiViWmegVaIFIY Q3a0kWw+f5cKg3ieDFxkXy/hXJOJZkq1oYaaUuRbDtMZH65rppJ3vsBotSRC6QN0thD3 zbWJmYHjJBObPkBFcF028nGez9LYg/Jq7LjKbFVxjCDYJkOIS4fpfD1/LQH1Sv0kxFB5 pfKg== X-Gm-Message-State: AOJu0YzZx3VLUifAPnv5G2pmbop1gIAbFeJ5ZEOnVvczqRTAuZHcsQEu y+QbzRgVbQ0jWBp8q4WkJLqxmZfHvhajQG+FsHChUqhckWPtbdmV+qAZuaanuEJWpYHwjYf/xVc = X-Google-Smtp-Source: AGHT+IECQvqe+eitCmgIDnr0my9kUWAR7/3iHpD0qKi18vFvdGQnrYimF/N6FJPphFRr8SvzBZaE6Q== X-Received: by 2002:a05:622a:1445:b0:45e:ff0b:8b0b with SMTP id d75a77b69052e-45eff0b8cf3mr8821071cf.35.1728371181735; Tue, 08 Oct 2024 00:06:21 -0700 (PDT) Received: from denia.c.googlers.com (76.224.245.35.bc.googleusercontent.com. [35.245.224.76]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45da764043esm33801921cf.88.2024.10.08.00.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 00:06:20 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 08 Oct 2024 07:06:15 +0000 Subject: [PATCH 2/3] media: uvcvideo: Refactor uvc_query_ctrl Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241008-uvc-readless-v1-2-042ac4581f44@chromium.org> References: <20241008-uvc-readless-v1-0-042ac4581f44@chromium.org> In-Reply-To: <20241008-uvc-readless-v1-0-042ac4581f44@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Move the query control error logic to its own function. There is no functional change introduced by this patch. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 45 ++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 853dfb7b5f7b..a57272a2c9e1 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -67,30 +67,12 @@ static const char *uvc_query_name(u8 query) } } -int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, - u8 intfnum, u8 cs, void *data, u16 size) +static int uvc_query_ctrl_error(struct uvc_device *dev, u8 intfnum, void *data) { int ret; u8 error; u8 tmp; - ret = __uvc_query_ctrl(dev, query, unit, intfnum, cs, data, size, - UVC_CTRL_CONTROL_TIMEOUT); - if (likely(ret == size)) - return 0; - - if (ret > 0 && ret < size) { - memset(data + ret, 0, size - ret); - return 0; - } - - if (ret != -EPIPE) { - dev_err(&dev->udev->dev, - "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n", - uvc_query_name(query), cs, unit, ret, size); - return ret ? ret : -EPIPE; - } - /* Reuse data[0] to request the error code. */ tmp = *(u8 *)data; @@ -135,6 +117,31 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, return -EPIPE; } +int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, + u8 intfnum, u8 cs, void *data, u16 size) +{ + int ret; + + ret = __uvc_query_ctrl(dev, query, unit, intfnum, cs, data, size, + UVC_CTRL_CONTROL_TIMEOUT); + if (likely(ret == size)) + return 0; + + if (ret == -EPIPE) + return uvc_query_ctrl_error(dev, intfnum, data); + + dev_err(&dev->udev->dev, + "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n", + uvc_query_name(query), cs, unit, ret, size); + + if (ret > 0 && ret < size) { + memset(data + ret, 0, size - ret); + return 0; + } + + return ret ? ret : -EPIPE; +} + static const struct usb_device_id elgato_cam_link_4k = { USB_DEVICE(0x0fd9, 0x0066) }; From patchwork Tue Oct 8 07:06:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13825769 Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (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 482BC1FA255 for ; Tue, 8 Oct 2024 07:06:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728371186; cv=none; b=Ae2Z/m8szWVWcSYraZFtVqyDnUhYy7iTjO4XS15kf0SgPPEs6rTQy1Mwg3gvFZjDJIVQ1vCNwDJndyvZ2b18Qt/GM1brwyPC70Hx0ecVHTc7V79jyGdQoEQcTdhKOiEu+2xasbIUsQkmDLUN3OotmrYav3yV6MPCoIBnymmiAXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728371186; c=relaxed/simple; bh=d5b7dVLR3ZR74qnhfrQJ5ldkhIB/k3f0HhwHYi75Hio=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iUarFjMtVLxcJTySNyLbKRPX5zVn2zxFEtyUX07JOvwLSketG2/WhouuPzGAyMNouHJC2B4bUSr0dd/LJqlOlGhSPMjUETRYlncYMWTzXlihNzVssK51FaVcc6DzeffYsAG/mynOi49AT9jyy7Nie1ZaGb7zUQ6cQRry4TuQWlM= 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=iqVKYuuq; arc=none smtp.client-ip=209.85.160.178 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="iqVKYuuq" Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-45816db2939so36853201cf.3 for ; Tue, 08 Oct 2024 00:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1728371184; x=1728975984; 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=jDX1gk9WLS0lOp3uclg0B3j1XeJVdEOnGdjwzsvJlzE=; b=iqVKYuuq909fG5Ig77lAqHozDxJB1cJlQ9q5+vZ4vkDwKEaoA2JhEtiSKIPF+6uYbL mXkBXarILRptzv4eSYN34Rvewbuo/246OXafNEE1RUlmfw0n4Ts/kVpp8Ww4sJC+xykf uOvgwt/X+s0HP3Ac+E1reHbBFqVMFoNJ9uGRE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728371184; x=1728975984; 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=jDX1gk9WLS0lOp3uclg0B3j1XeJVdEOnGdjwzsvJlzE=; b=XuwZeKIZfgJOxzZvkvHGaim56n0pvxjLXyCJyntSXjiVbaY/k2DCC8c1X4CerUtlJW PsYamY8WD8saHiuDvb378hApqLC3hxZiqXT08NM7u4DNPcPxPNxWBP8tHBljXDLxO531 AwsrQikb5RiDUfxaWRsHMv1WzJkOmwSdOdDCPL7y0NSbpMyUYC2LpFNGTGDD2G4Jg3NL SIK/zyjsKM/hHKDolhxURbq3WfYlD45632mgckRztC6+LaD9/fKcx3XU+mgQTZ6wDhUq kOfxod5I+tWqBroh42S3BUFaacmPwYi5oPS5w9h3vpNwwY2ZY33jB1+ptj3pfmFLA6ZY 4NNQ== X-Gm-Message-State: AOJu0Yyz4TumbBG/L3atl/OjKy/OItpD02Tj2w6JjjGflOoOrMtSBHgn aS91bCDAh0G6yLTVPGxGYSKY0MiH6v+WEg3rM8KjCo+NjYKJNx59dLfogJFrLars9BWh+I3nnJE = X-Google-Smtp-Source: AGHT+IG39BBoTTcIAWGA9WiMjv/rkPGoXXlsuN2UqZIeIx/T7ZMNueHs9O13LRs8lKx5eIeZ5zSWSw== X-Received: by 2002:ac8:7fd0:0:b0:44f:f287:c9b4 with SMTP id d75a77b69052e-45d9bb5b04bmr203085781cf.44.1728371184187; Tue, 08 Oct 2024 00:06:24 -0700 (PDT) Received: from denia.c.googlers.com (76.224.245.35.bc.googleusercontent.com. [35.245.224.76]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45da764043esm33801921cf.88.2024.10.08.00.06.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 00:06:22 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 08 Oct 2024 07:06:16 +0000 Subject: [PATCH 3/3] media: uvcvideo: Add more logging to uvc_query_ctrl_error() Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241008-uvc-readless-v1-3-042ac4581f44@chromium.org> References: <20241008-uvc-readless-v1-0-042ac4581f44@chromium.org> In-Reply-To: <20241008-uvc-readless-v1-0-042ac4581f44@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 If we fail to query the ctrl error there is no information on dmesg or in uvc_dbg, which makes it difficult to debug Reorder the log position to fix this. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index a57272a2c9e1..bdc3f545a15e 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -83,11 +83,11 @@ static int uvc_query_ctrl_error(struct uvc_device *dev, u8 intfnum, void *data) error = *(u8 *)data; *(u8 *)data = tmp; + uvc_dbg(dev, CONTROL, "Control error %u, ret %d\n", error, ret); + if (ret != 1) return ret < 0 ? ret : -EPIPE; - uvc_dbg(dev, CONTROL, "Control error %u\n", error); - switch (error) { case 0: /* Cannot happen - we received a STALL */