From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C158FC4332F for ; Tue, 9 Nov 2021 01:02:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AEA8061215 for ; Tue, 9 Nov 2021 01:02:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239029AbhKIBEy (ORCPT ); Mon, 8 Nov 2021 20:04:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:59938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241643AbhKIBD7 (ORCPT ); Mon, 8 Nov 2021 20:03:59 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B6F446120D; Tue, 9 Nov 2021 01:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636419673; bh=yqS5EcZ/hI7QK4grPthEC7x/xBPlFyeCWGV5YGToVBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bEgzV9nO4RVQyYYvoifBMHg+o4/oKehU1SGHc00zo5oHolHCs2jGSgdh+Veas/P0q KymlG5DYkVcAAzTLU4Qy5mNaVFqDojeRUYDeGtYYhtfWZKtG5nVWGczIWzgyYDWBNR I6x0wzmPJV/OWNN8sGMPQsO2ca7dnH4WDnEiQPUQy6LltOV+poj534hCdYdtYrMepA YARdmW5ry2KEm92PZtrXjbYOkkAuiEp3tCNFgEbdYPfSvwq05TFbjL7+JmeKN6ZQXV 5x29ES9X7Brc6KGcbY9KiEqSFKo2OW7UqNFF4tRuyQ2+ghv+f2iSFO/dagAiAwzs6s WV3/vIJL0jDLw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ricardo Ribalda , Hans Verkuil , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin , mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 042/146] media: uvcvideo: Set capability in s_param Date: Mon, 8 Nov 2021 12:43:09 -0500 Message-Id: <20211108174453.1187052-42-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211108174453.1187052-1-sashal@kernel.org> References: <20211108174453.1187052-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ricardo Ribalda [ Upstream commit 97a2777a96070afb7da5d587834086c0b586c8cc ] Fixes v4l2-compliance: Format ioctls (Input 0): warn: v4l2-test-formats.cpp(1339): S_PARM is supported but doesn't report V4L2_CAP_TIMEPERFRAME fail: v4l2-test-formats.cpp(1241): node->has_frmintervals && !cap->capability Reviewed-by: Hans Verkuil Signed-off-by: Ricardo Ribalda Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/uvc/uvc_v4l2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 6acb8013de08b..c9d208677bcd8 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -472,10 +472,13 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream, uvc_simplify_fraction(&timeperframe.numerator, &timeperframe.denominator, 8, 333); - if (parm->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) + if (parm->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) { parm->parm.capture.timeperframe = timeperframe; - else + parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; + } else { parm->parm.output.timeperframe = timeperframe; + parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME; + } return 0; } -- 2.33.0