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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 3D975C2D0BF for ; Tue, 10 Dec 2019 21:46:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0651C205C9 for ; Tue, 10 Dec 2019 21:46:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576014371; bh=aqwj88xl6FPJ4U9MmiU7+N9Oby5fcrFg6woKbKAen2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oyX3rUkpVR8f6ouFawuxSvK2bqM45IqaYh8hyVH+U/7XmHCPVbvaenV4hBsnf8idX bkK7DC4iLDVuMWGj8ZxGkCZS1TL9XtjGdqLIlSWU1dvrL0simBVHLOgrf1DpqqYgcH ZKbNfuW6lgtNImyIBdU4eiNDLyZPlekMK0yXJqKs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729441AbfLJVcs (ORCPT ); Tue, 10 Dec 2019 16:32:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:36322 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729231AbfLJVck (ORCPT ); Tue, 10 Dec 2019 16:32:40 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 240B2207FF; Tue, 10 Dec 2019 21:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013560; bh=aqwj88xl6FPJ4U9MmiU7+N9Oby5fcrFg6woKbKAen2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AKyfeaoAhB/gW9RjDdiYoNvQb8cQIwepV0JmpTndUp6kDVR5T5ry/mzXYrUOM7L+K +fgW07YF7gm+94JFOKN0LLniulrun9/qb+thUCS/lf8VK+Nuee/mtZtXsADtEgAxQN OsIBWVyFtcJl+qmdqvAhIKj5qUWJQUOz2EsUgSk8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benoit Parrot , Lad Prabhakar , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 015/177] media: am437x-vpfe: Setting STD to current value is not an error Date: Tue, 10 Dec 2019 16:29:39 -0500 Message-Id: <20191210213221.11921-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benoit Parrot [ Upstream commit 13aa21cfe92ce9ebb51824029d89f19c33f81419 ] VIDIOC_S_STD should not return an error if the value is identical to the current one. This error was highlighted by the v4l2-compliance test. Signed-off-by: Benoit Parrot Acked-by: Lad Prabhakar Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/am437x/am437x-vpfe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c index b05738a95e55e..809320decdeb2 100644 --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c @@ -1848,6 +1848,10 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id) if (!(sdinfo->inputs[0].capabilities & V4L2_IN_CAP_STD)) return -ENODATA; + /* if trying to set the same std then nothing to do */ + if (vpfe_standards[vpfe->std_index].std_id == std_id) + return 0; + /* If streaming is started, return error */ if (vb2_is_busy(&vpfe->buffer_queue)) { vpfe_err(vpfe, "%s device busy\n", __func__); -- 2.20.1