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 D9F7FC433EF for ; Tue, 9 Nov 2021 01:13:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C815861A0C for ; Tue, 9 Nov 2021 01:13:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241918AbhKIBQ2 (ORCPT ); Mon, 8 Nov 2021 20:16:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:39834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242626AbhKIBN4 (ORCPT ); Mon, 8 Nov 2021 20:13:56 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7720A6137F; Tue, 9 Nov 2021 01:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636419945; bh=MM9cwbHgrj77IxwphTaDtjRZFY/LPDOsxisHP0Wf3DI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W5tsBuABIIheQVQPSmlyAhmEvGIYKGqaRR4LhyuS/BD4ohrt38ofLE2jOJPQwMH9x uRXHb6qYYpIzDab0SIW95KTTwL/37hgiv1mzsuAdYu8PRdffrE5vhJ3mr1rhnK0DXk vg0nrxrbK86weYwpWPGTgI+Z7zL6JDr1vqiuuhJiVKOfXhmg6eRGNhvu6hz8mcxUY5 OzpLLl3kSrD0o3vh3ZFnOvarlRVc0QCfSuPyZJupOPNU1P05PXneK5z4ouBv3YH+kZ NF8eHoM2uwhnl5XwRbB3tXDXunxMt2FCvSj3z8rvJeD85H6YlPB0XHNt2TypzxQu27 f0xCrhyb1dJRw== 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 4.19 16/47] media: uvcvideo: Set capability in s_param Date: Mon, 8 Nov 2021 12:50:00 -0500 Message-Id: <20211108175031.1190422-16-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211108175031.1190422-1-sashal@kernel.org> References: <20211108175031.1190422-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 2ca1e8ce6159d..e858f4f189ed9 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -474,10 +474,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