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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 EAFC9C2D0CE for ; Sun, 29 Dec 2019 18:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC47820748 for ; Sun, 29 Dec 2019 18:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643031; bh=KYV3TvSzgFQ9+R61pPWa/09LsyaccchKA+de+OED69k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kYVjv3WxMx3fnrQY455MftYMP9Chu7+p74KGQ1vH3oYUwiC91OjLFIggIC5atg2WW vE5EtxObl6TOWME+fDLcHjrovBPwsdWB5D/EDOa3IgTV3pVrPdsHFlTAXhlWl52Kmf GmS5XBlz+SaPZYh7uUtq5LeAW1Mz/xwM7RQ1JRCk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730643AbfL2RoS (ORCPT ); Sun, 29 Dec 2019 12:44:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:52312 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730656AbfL2RoR (ORCPT ); Sun, 29 Dec 2019 12:44:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8E10E206A4; Sun, 29 Dec 2019 17:44:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641457; bh=KYV3TvSzgFQ9+R61pPWa/09LsyaccchKA+de+OED69k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mdkCOaIBS6yUEtWVKZ8FMO7DQrGrqwo0NLNUYP8UZXUBpDqqQxByg4PKsb51Nf47A Xhfjnmpdk68BJ2ZSVrBLzvBotZa7fKJp1Wnc4J66+9D1s2h3HzryvDpBGClqYGW5li dHhFs0HkCUTh5OXr+kZ/sYBp1rhBFObIsOs8wH6w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benoit Parrot , Lad Prabhakar , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.4 074/434] media: am437x-vpfe: Setting STD to current value is not an error Date: Sun, 29 Dec 2019 18:22:07 +0100 Message-Id: <20191229172706.563012528@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 2b42ba1f5949..e13dbf27a9c2 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