From patchwork Tue Sep 20 14:11:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 608139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36CEEECAAD8 for ; Tue, 20 Sep 2022 14:13:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231666AbiITONY (ORCPT ); Tue, 20 Sep 2022 10:13:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231670AbiITONG (ORCPT ); Tue, 20 Sep 2022 10:13:06 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 552DB140E0 for ; Tue, 20 Sep 2022 07:11:23 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id lc7so6621353ejb.0 for ; Tue, 20 Sep 2022 07:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=IsXtqWi3aYMJWgr4SCjULTHnfzXmNkyNP5+0rfZs3GE=; b=Wg+USxpTe2mvtgr+Cd7kMlIFnWdYOcgj1feCbTD48oJIvWAGrIPvx2p8i8NZ/2hCCw /aY2Y9toBiozhvZ4WbJOC7ncsBCDHggHirIjyMR3EAlySXxJYEuiK7YN8m3uLWpByMIn AxXP1glYWmVsKB6atXE12CCxANcsv/229T6Gg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=IsXtqWi3aYMJWgr4SCjULTHnfzXmNkyNP5+0rfZs3GE=; b=Esw3OjfK8jRsA3gXJqdQP+Nfp/l6kiMXKo9pf85iEltmXe3vvtkmq2xm4bUmmGFZmy P4jlZa8pVjWnQYPsmD8+qWzsJUhR5/X229A5dweWstSMA9W1d1+HfTz7zhNj90yLd0qu EO3Z9ggbRWRRVqkOeJVCEi2YzlT2l/VzYrjTjDb2/GALxW34bXMTc49mp1hEREy+ZnDj fSc+izweN6o3JejNkkpFJi6qjSbC5SpoMID8WFVnwPaG9L2Waa1YZWY96xOPspuzF34r VnWq77bqxgg7Qdfjjw+OekUtnSl10+1qSLgk9UTDdm9iD1/9LzJVkULAii8o+3FGAqnU iTnw== X-Gm-Message-State: ACrzQf1YnE7rzgsCU108oKt1oclrH2AepMjXWuscI0c3OhOAdCnfeFpL l8C+u+MmErqUW+v2RlrA1rutyrDS2gu7JaRVdzM= X-Google-Smtp-Source: AMsMyM4Tsu6DrqVeVB0QDh8AuoFV1Dh8rvxs30c/15xLvA3rnx8VcrJnpsiyiZ2SBJy+3SARBYf2RA== X-Received: by 2002:a17:906:730f:b0:781:cb9a:cc1b with SMTP id di15-20020a170906730f00b00781cb9acc1bmr2194784ejc.41.1663683081472; Tue, 20 Sep 2022 07:11:21 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:21 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:05 +0200 Subject: [PATCH v1 2/5] media: uvcvideo: improve error logging in uvc_query_ctrl() MIME-Version: 1.0 Message-Id: <20220920-resend-v4l2-compliance-v1-2-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1125; i=ribalda@chromium.org; h=from:subject:message-id; bh=xuDJMTqPwFnBT90gGjW9sM+//WBwScMY4uWO/jQUOuQ=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcn+BMi7ITepYifnHZ0BCDGSoJWTOm0BW6fy98Tr u8zH2QOJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynJ/gAKCRDRN9E+zzrEiM9tD/ 9GwAfC5G1onbDTMyTZEVTc2GnoQQi38QcbejqNYFqdF8qfKCD7qvdjt4OvAYlFnNIOXmBPbqy/arGd vaILw71ZtnaXhAet00YxVRvtswXeWlWJdCyzRpaMT71o2p2tGGZO+aBQOYwCqp/CjGAOe6+rTlFx93 RbzBAPiKnkMlnsj9guKyWLE4p3vCPDHfhTdihcC7xYX4bHEYjGF687htu/Ilfxt0PSbJ36+HEObyOk E4IjvA393FCnsfxUWe/IQLk9m2fpseYmDw9yOjmp2eb5jmXsrrXdmfDn+7vSy/+rrZoN4I9VszxZ5s 0UvmzTcU9YcgyLIbq7bvhfSyHV8iukbm5hV2REtlcl0dczDBSVd/IbQPd9UjQX28ffsiGGLQ70boiK 6nfAEFnnnnNVmgjAudGOElgbphyocRrBBL8ZEPA/oM4Hk2VEUPGHDAyLMC54Q0sD8BBA3wbV0J/JI5 EzQVTuK+crzLdqN4lxzPZZ4saFP0z4jae1Hb4BK+j3eylNsSJ8y8gYJwEAorD51xLPXGC+AUrxt5j5 FoB0RxDkq7aRDlOdeDM0AQXd45YewZRlwY49y1qDKuRgxNPnvj0jDMkYSBLItMQvW0Mb7ijR7v/7KI 2/zsy8E4S9lT38JtFfq2x2Ik4hQMhy7b8T3Gz8g+G4E0EgiU4ym9Lis48iEA== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Hans Verkuil If __uvc_query_ctrl() failed with a non-EPIPE error, then report that with dev_err. If an error code is obtained, then report that with dev_dbg. Reviewed-by: Ricardo Ribalda Signed-off-by: Hans Verkuil diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 170a008f4006..2cf7f692c0bb 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -79,13 +79,14 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, if (likely(ret == size)) return 0; - 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 != -EPIPE) + 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; + } + /* reuse data[0] to request the error code. */ tmp = *(u8 *)data; ret = __uvc_query_ctrl(dev, UVC_GET_CUR, 0, intfnum, From patchwork Tue Sep 20 14:11:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 608137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B944BECAAD8 for ; Tue, 20 Sep 2022 14:14:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbiITOOE (ORCPT ); Tue, 20 Sep 2022 10:14:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231503AbiITONM (ORCPT ); Tue, 20 Sep 2022 10:13:12 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 625342CC87 for ; Tue, 20 Sep 2022 07:11:24 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a26so6508000ejc.4 for ; Tue, 20 Sep 2022 07:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=fZx/rWrR7bth2k3zX90922HeFwXDXF4+XRCwzM0uxDU=; b=hNs3RX9xQGVD65f7QO8VzrP4znwu+FGcrbo6ocv7O/05gKBZ1wH41NfT1tMoB9JKK+ fCnEJGtdMDBVBXb1GRcqA66h+89xj3KHTLcreDEUobgVWQilew9i+jzjGMKG1tG/c+ds QX40CW1oeB2mxfZTxSz0tD36imknHdZUK16b0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=fZx/rWrR7bth2k3zX90922HeFwXDXF4+XRCwzM0uxDU=; b=nDZSelDQSxatjwo5M3dAw8LYHmc1K1vpGWfW+/4Se2hGH6LNWxEH9mIDF27SbChfs+ jFThOuTXFhqY7EpsqzOa2jBZfuqPZP1oNeCcB5cm2fYHftGaf86qbzjI8UXwLRyyscbg JPon8PyQdDWrSs2ZuF4Rm25CDk5aGhFOVuILl4JKdnKWBD85Cb3cQZCyq+us2TOB/tWm 7nAlmkc/3VMdNIhkfsrECRV8VXFjKXbiJF3wC724qDtooEpg9TofVwq2mCTejcfyAx0f HoD9dnhoMED4X/vijCaMTjQwhgNPrOVvuUmVy19MULpZ4Gxckp9lLB4jPDSYNsZaWnFc vjOA== X-Gm-Message-State: ACrzQf3gtJX7dzB+mXHAI34WyUOaPLirzKWjPzXds7uWNIyO98kszW5S U3EfogdfV/vSchVegW8YIj0cQ+67/5qlvPAvK6E= X-Google-Smtp-Source: AMsMyM49va1rmcsPaDlAugeRoY+PzfADCzIDSwOMykHAqiCqO0+W2W/625FQvzvQ7U8cpRoUv2xFOQ== X-Received: by 2002:a17:906:8a6b:b0:780:ab37:b63 with SMTP id hy11-20020a1709068a6b00b00780ab370b63mr15122776ejc.365.1663683082739; Tue, 20 Sep 2022 07:11:22 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:21 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:06 +0200 Subject: [PATCH v1 3/5] media: uvcvideo: Return -EACCES for Wrong state error MIME-Version: 1.0 Message-Id: <20220920-resend-v4l2-compliance-v1-3-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=854; i=ribalda@chromium.org; h=from:subject:message-id; bh=l3Tve8hGJ5W5tTbag9O5QNFnAI00qvVi1fN45JRNTAM=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcn/J5h+0gj3RkVXT+F2wF6DERtyqXPbiyyPS7Lq 01rqx+2JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynJ/wAKCRDRN9E+zzrEiHQTD/ 9ZBbIC//geY3g3ywDr6Lg3j0lkU5m5cFuiwGpZL3bDLnUZKL3tB9cmqFZQ/7+/DdRcS1r4tAb0rsWq 1XHhHIc+sM7TEzcdm57ZzhYfopuV/68vfB6OJCwS92xPqfL162Ra/Hw75GVS0MNrF+xX6US6MnnUYX BD8XtqNgRvMb878fj3jVT1cpI7wqY5wYEGOh5hg672qjO5lnXBiJJDNJ9dFxA5Y32sqBqPdjde+d4x 317Wit7YVtGnscLOwtnJquHVHK1mlclPv17aZXGiT5ja23aONAmSilXyZ9gIq1SSYOD5b9mLl7/Fx9 B49LiMIqk/Bu0pgLxrfG7lWNJDpjwoosiCKyMjwDemlX4IH2xutfvtoJbE9C5X1FnR0Z/k5WgLXG1n Gi/qwNnme0/qaxzH8LtckCv03PgDdT8F0Z7hCXHH/kHIlkbJxfbz4PYloO0xVKyrAzB/28t90eylny xX7q5sDFzaEGFATiPrPHgxRbMNG5JO9BadznggBkBEHsPqMEfPVvAkOTNxyyKxLpg1dKVluB+dgUDw b6BPlBIUw9vE5vdRn2Soq7bVPLR+DffaYnFgF75zjjWTZrurbo2BKwvRjxJkfLQKfmbmYC7FD6JrvK sorGg3tmm1lsqmx2Eqki3JvDotU44SzDJgR9u6d61m2hvOpy7ypTvYvG/CEw== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org For error 2 (Wrong state) return -EACCES instead of -EILSEQ. EACCES is a much more appropriate error code. EILSEQ will return "Invalid or incomplete multibyte or wide character." in strerror(), which is a *very* confusing message. Suggested-by: Hans Verkuil Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 2cf7f692c0bb..497073a50194 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -108,7 +108,7 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, case 1: /* Not ready */ return -EBUSY; case 2: /* Wrong state */ - return -EILSEQ; + return -EACCES; case 3: /* Power */ return -EREMOTE; case 4: /* Out of range */ From patchwork Tue Sep 20 14:11:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 608138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22513C6FA90 for ; Tue, 20 Sep 2022 14:14:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbiITONa (ORCPT ); Tue, 20 Sep 2022 10:13:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231580AbiITONK (ORCPT ); Tue, 20 Sep 2022 10:13:10 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA19E1A380 for ; Tue, 20 Sep 2022 07:11:25 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id q21so4008219edc.9 for ; Tue, 20 Sep 2022 07:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date; bh=LybwIQYtr5MkOTsSbogVgHlZvfV5O5f7swHU1e23Nnk=; b=XGpXPObUCIdcbW6+kATPE1pa0rJOXlPSqXnXWxFCMfrdei94sbWnWOguM4Szh4xAz5 qw3MeS//hxpC/16vm9+/7bKhnPZ1S+einB3uW2QlJzNPzg6us/9Kwz0VzjoouFyemWOP SLj6xaKOTLbyfGjzHyMu4JgLdaQJ+K37OTYx0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=LybwIQYtr5MkOTsSbogVgHlZvfV5O5f7swHU1e23Nnk=; b=em7U5Ej+k2NkkhaX2+DeOM0m3Nucu0eiDKnYw7EBsbcp+xW7C+FJggYAEci+zsijkJ lGZqswaL1hJ/4xw/Hlp1xvRvoQrwgkTew1BrSRRL1810IXSRQT+n6fh9/BG6A4eujhSd SrBoWtUihIOm8LtNxXcWjoR+W3WwJ9LF+qk8GeTAkMknzH+CDZHt1ANSo0tJ73YdDHbr vHrX2rNI4vW8mARilSgdGVE2ABsA1FAbhexZKfM7L9RmQSZCy9gozpIhM9SPNa2blXs8 MprxcsSEgExUjvJdUM1hmoHQd15shx6kRIdIjgUIKZ3OS1bUisLgM9qTGf+Q5aAMYVEa JrVA== X-Gm-Message-State: ACrzQf1sLHGUjtNwJceUOvGL6b0XueNXI5HwrW9NVjjQHv3cX5hbA09D p5AVb377n89IWippcsyPoqXPsw== X-Google-Smtp-Source: AMsMyM6GueK/ScSoEqg+pIo2Qo627Mmr5ypK8TeU2+MpGfijHbEmj7S/BGDsKKkFvndBRaJ42Aqo9A== X-Received: by 2002:a05:6402:b85:b0:44e:dad7:3e24 with SMTP id cf5-20020a0564020b8500b0044edad73e24mr21080703edb.264.1663683083754; Tue, 20 Sep 2022 07:11:23 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:935d:52b0:7461:88e1]) by smtp.gmail.com with ESMTPSA id b24-20020aa7c918000000b004518ee90b4dsm129668edt.1.2022.09.20.07.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:11:23 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 20 Sep 2022 16:11:07 +0200 Subject: [PATCH v1 4/5] media: uvcvideo: Do not return positive errors in uvc_query_ctrl() MIME-Version: 1.0 Message-Id: <20220920-resend-v4l2-compliance-v1-4-81364c15229b@chromium.org> References: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v1-0-81364c15229b@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.11.0-dev-d93f8 X-Developer-Signature: v=1; a=openpgp-sha256; l=835; i=ribalda@chromium.org; h=from:subject:message-id; bh=lvRGgJW7MhPUQfG+nYO+p570MCZiCiBKUgYSsY4PyFM=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjKcoBYgbZrbg5ljLAWYbJnhg/lWzmT9LI8kdMIM6Y A04RZISJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCYynKAQAKCRDRN9E+zzrEiMJfD/ 9mQFTZGV9/PXf7DjRSKX9FoxJQmOgiqY4qZ5id+f7u+hpqhJmjnQgYEBPaWvIan+xqNkPMN5IxotY5 nZT4mrnDNc2tr9NSaPHwpV5CGjYpDgvWIV8ABMSnFHwmJ9njolndOOccOVrsro1w6IYKJPEnH3oelC p8A+oEPhsZdgqHTWlsO53mBY2+YVnQLSxaOwSblTpjV5BhAcSedYDObFMUVAped0NjJP+O0eGpgGQn qAQtmEh/QtsV0cZtt21RxZPFGAndVcI3xvA3/XH4646eyrzE/FsgIltSlwgSlwWrw1nzgVx+iVP7rX cJihDQ+akf4ssGXcfb3+gLwuXA8ywMED5/Gl9ZvWz5DLSV82WbPeS8l7YtnMRteimSUfOnaiIO1Tmh P/TOyPtL39wZFBKRU4iuwVuaXmsL0lkIOgjncsQsXP3n/upFns28GiBKuI5z2F6qr68lDsn2Oy0ZB0 hkKsNPLgjA2yxJQixUSYO6GvlCis5DdizE5E0MkRBgVnoTfU8mpy1u1Ae7Yji0p+4T/0h4hSdV890L 8nZAgdV8oOs/A+yEFtnupy3g9ZyRSHbcoitHpnHdosH5/Gh9C4dydk0mb4h5uP8NxCOejt/sTkOOwa JrKqUEsprp6uDE+lIFW0jJJ+G0nr1fACK8qNMpXHlivWP0K4nhFbiNN+cKLA== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org If the returned size of the query does not match the expected size or it is zero, return -EPIPE instead of 0 or a positive value. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 497073a50194..902f2817a743 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -83,7 +83,7 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, 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; + return ret < 0 ? ret : -EPIPE; } /* reuse data[0] to request the error code. */