Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9123876pxu; Mon, 28 Dec 2020 07:12:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBO+ApaD37mlod4YvLFpwIR/KRKPFq0WrBAtz3zsw0O+/a3drZQQs6BWcGi8eUlluY4A5U X-Received: by 2002:a05:6402:b88:: with SMTP id cf8mr43611429edb.140.1609168350879; Mon, 28 Dec 2020 07:12:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609168350; cv=none; d=google.com; s=arc-20160816; b=Lr42F9V2Ab3kzDEjcizpwN5Ubnv/7hrvsjYxHwSXCZsXwGpLZLJo5BJBlVhcVq+uuq WHnEBmx6FlVdXitgir8OwvBKYGG3RTmwuW/vcznig7TyQlAUnBAHXat2nDhK8UMj+lwA +siHFHlAh3R+XwPvXPaPHicBLQMh3e+g7Evf9jGSHEuppX6ZLMjSwqbG39fkX4aB74It 4EFpIpl9wUpRg2/BabeBEToDb6lGoOvP1M2GDYmDsob7OKT75SIP/VFd9FH04XU0py+p f5BT3jDh5opHn1lNfd+90A+CsooKgJZWcrrf3uEHA6vT8efnupChU0vYV0TlN2k68LN1 fXJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FHT8/JBseDGhEm0pcfy8016FEhyA409xWlKhJ6CpyrA=; b=Y2SI/9BAAMNj3zoA4t4n/rHjBz97wEGdSSao6BwHh4RBhDT3LC7Bo07RvkqOY+VcMF BOGEEmiQJWZwAfn6DlsBm5Ey8og14sX6c6A6tQqY8VNiQDYFzjTtx3N4WIwpuq2J9U7A hb956s8hrAdBRpHpjImwJ1kvXtAu6xRaj4N5DoSzheycO2Y5h2GSYnSWIX+GOjDna4FB 10i0mkIoVrEVGh+s8UZ+eQm+mvGkGf603ae3fZ+GWmxhrrsDZFQYYIeNjapE6zLbWytu jgclVoFasZCLqYgXRLgpxd1P7Fq9WoCYa9BRh7V/8D3xtAHUpadgwOcl6BPPMWSBxF1W UyxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XR0IAySA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g13si20084452edk.250.2020.12.28.07.12.06; Mon, 28 Dec 2020 07:12:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XR0IAySA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438947AbgL1OKG (ORCPT + 99 others); Mon, 28 Dec 2020 09:10:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:44542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438931AbgL1OKC (ORCPT ); Mon, 28 Dec 2020 09:10:02 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7BF0C207AB; Mon, 28 Dec 2020 14:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164562; bh=nKhsibxIgl5pMJc4yubbeYhDJ7KRHiUHEMiKE0rYd/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XR0IAySADdfjg0aIDiBlz6LCkUIx+MiiZ8ReDVuQQ7uEupLYYrljvPR/Pm+RiIU8s Zq3NFRNQyb3QtYfhLbjFbF2UVYNryv1QcUMuozcsHAnb2GBJOQZ5dc4G2yDeqHpqJd DzDGcgKp+Nb+macbvJaubiKgGIgrJMmY8ayB/Zc4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Gomez , Ricardo Ribalda , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.10 219/717] media: imx214: Fix stop streaming Date: Mon, 28 Dec 2020 13:43:37 +0100 Message-Id: <20201228125031.470580878@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Gomez [ Upstream commit eeb76afbe8d91e112396c6281cd020725160f006 ] Stop video streaming when requested. When s_stream is called to stop the video streaming, if/else condition calls start_streaming function instead of the one for stopping it. Fixes: 436190596241 ("media: imx214: Add imx214 camera sensor driver") Signed-off-by: Daniel Gomez Signed-off-by: Ricardo Ribalda Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/imx214.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 1ef5af9a8c8bc..cee1a4817af99 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -786,7 +786,7 @@ static int imx214_s_stream(struct v4l2_subdev *subdev, int enable) if (ret < 0) goto err_rpm_put; } else { - ret = imx214_start_streaming(imx214); + ret = imx214_stop_streaming(imx214); if (ret < 0) goto err_rpm_put; pm_runtime_put(imx214->dev); -- 2.27.0