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=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 6869BC2D0BF for ; Tue, 10 Dec 2019 21:05:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 336042467E for ; Tue, 10 Dec 2019 21:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576011906; bh=q3Jfz1RtubPcWyu/C4vJU54FE8I+tD4vNOt4IhKgsGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qNTGrY0CsBDLVzBiWF37g9jGHn2Gwh8iEPNdq+91E7NeFrLxeR6WYK0VZbYsFItih YP1URraPS/ZOSA0SenffuFw3M62uGhd7jRvkp6cI4dUSbtOatHGsKC8psjoNOmzTBs JxwMNoptK9CodjbY1r0LxDWzjS3Ni5QZQLF4tmLc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727562AbfLJVEu (ORCPT ); Tue, 10 Dec 2019 16:04:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:49964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727492AbfLJVEo (ORCPT ); Tue, 10 Dec 2019 16:04:44 -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 84C0224687; Tue, 10 Dec 2019 21:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576011883; bh=q3Jfz1RtubPcWyu/C4vJU54FE8I+tD4vNOt4IhKgsGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IHkWyjI1aG8VblCtNMX/rFh4qTIrQTnUl4RgY8OHP5FYd05+AkIfesKFncnPkf3et IJ9yByhI+zsra50nQ11GWsJnFJukt1WTEjfl4yjg4BeTY9ILlcd/WQqE+dAZPCsphg pl/jgsUw2a0gtVixAlFMRPIBI/Tf5lk9pzChw+wI= 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 5.4 034/350] media: am437x-vpfe: Setting STD to current value is not an error Date: Tue, 10 Dec 2019 15:58:46 -0500 Message-Id: <20191210210402.8367-34-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210210402.8367-1-sashal@kernel.org> References: <20191210210402.8367-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 2b42ba1f59494..e13dbf27a9c24 100644 --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c @@ -1830,6 +1830,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