From patchwork Thu Sep 9 15:00:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 508562 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4666EC433FE for ; Thu, 9 Sep 2021 15:01:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 307A1611BD for ; Thu, 9 Sep 2021 15:01:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240834AbhIIPC2 (ORCPT ); Thu, 9 Sep 2021 11:02:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238605AbhIIPCK (ORCPT ); Thu, 9 Sep 2021 11:02:10 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D720BC061787 for ; Thu, 9 Sep 2021 08:00:52 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id n10so538320eda.10 for ; Thu, 09 Sep 2021 08:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nyRNd3VAua6ltU/T1+T7w24h2BGtw7h9hpcdASMSl58=; b=YcYQr1gQwSbzGcHWCUaAILJtH/tDjpoaEA0KpLgw/Mo9sklFUPX/qlAIUVGZSTjmTg VugoNYAsyzAwKU+8JXV4ALFAI3/Oo49mwzpi7Tmy7yUM/u/8uZCbwBZBO/TWECgY7bar XFipPiBVEHq0TBzM0M/1tZe28Cusl0wqLhVh4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nyRNd3VAua6ltU/T1+T7w24h2BGtw7h9hpcdASMSl58=; b=XLK6BUuf8qYQfuTbzHzmSh4itT78bZxrBN7aeEyjq6UtwE7KmkXY/kAeT4o0GNxYi5 gAwoFNxIqg+h87XVXFo0QkDhaBmIzsUbZ2kZZMkJinlqEOwbqWRo9sOsE6fobh+9LwKC QaFHw3mKhO0kD7bVOdFCa+k1sTMQjX0sgZKuPxWj1nPJGm1oj8rJUQNbvJByuheX5GNJ SHkACJf5JNal52WgsKvoR6TbwmJQNBFFbRvjR+BHLshrrHA6N5FGbO4BqbNBLQn19/qL /uhPmUdeClhT1YZMsFMWxTsx8m+OhieRRuGw9Gw62gjYH6odTptHZVFxzKaoE72xzzGm zHgw== X-Gm-Message-State: AOAM531c4wV7cA0YYeonTWwT9MMgRanQjdrkJFhEQFzqcNaNY1pXbyUk cOoq3bNiw4IYHFEOo/n4zZgQyw== X-Google-Smtp-Source: ABdhPJzBWbTmbMGQ/8bdekcwBUK9YxcHI9yToRdEb0KUqutjH/4WiBY8OQN6P+DdcfSOa/rJm19KNw== X-Received: by 2002:a05:6402:358e:: with SMTP id y14mr3664246edc.296.1631199650910; Thu, 09 Sep 2021 08:00:50 -0700 (PDT) Received: from alco.lan (80.71.134.83.ipv4.parknet.dk. [80.71.134.83]) by smtp.gmail.com with ESMTPSA id h8sm1139644ejj.22.2021.09.09.08.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 08:00:50 -0700 (PDT) From: Ricardo Ribalda To: Laurent Pinchart , Hans Verkuil , Mauro Carvalho Chehab , Sergey Senozhatsky , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, tfiga@chromium.org Cc: Ricardo Ribalda , Hans Verkuil Subject: [PATCH 2/4] media: uvcvideo: improve error logging in uvc_query_ctrl() Date: Thu, 9 Sep 2021 17:00:44 +0200 Message-Id: <20210909150046.57615-3-ribalda@chromium.org> X-Mailer: git-send-email 2.33.0.153.gba50c8fa24-goog In-Reply-To: <20210909150046.57615-1-ribalda@chromium.org> References: <20210909150046.57615-1-ribalda@chromium.org> MIME-Version: 1.0 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 --- drivers/media/usb/uvc/uvc_video.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 9f37eaf28ce7..dfea967309f2 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,