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 2FC58C33CB6 for ; Thu, 16 Jan 2020 18:46:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F38E420661 for ; Thu, 16 Jan 2020 18:46:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579200398; bh=AoP3OOWfzX2lH8u8U55CO/Qyhb9NQUI2z689M7v43fM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SBStR3mpSj+fwXvTwvzNF8OFjDyoxLEo1puE5Wd2bqPq4HjHodB4PGq3urmSLgFze oOEiH+MgSr+r93rUbZ75Ic9GqWXNOvtJMuJg0IkflRmqKFmqe4vSHT9FJ9dtg9McBn 4QSanpCyyrNIJM+0xER84JKDjEjGn/cw21c9yZMw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389875AbgAPRKO (ORCPT ); Thu, 16 Jan 2020 12:10:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:47374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389832AbgAPRKF (ORCPT ); Thu, 16 Jan 2020 12:10:05 -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 00E2224683; Thu, 16 Jan 2020 17:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194604; bh=AoP3OOWfzX2lH8u8U55CO/Qyhb9NQUI2z689M7v43fM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lyroaGKsBMWFT3or/bR/ixFKt2UAAPQcmEk2Ns84DZX5UDQR7gRbxI751+hLtPU9k P17mMa1Lcb4GO3X5E2gTZBiY0DPu0WzissMak7UPEnWyXb3RD/k7anPAUUu45b4zpQ V7ARbge5Dkk/Vl8j+gsbXRA03EuYI685FZa09Wko= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Jacopo Mondi , Geert Uytterhoeven , Kieran Bingham , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 471/671] media: rcar-vin: Clean up correct notifier in error path Date: Thu, 16 Jan 2020 12:01:49 -0500 Message-Id: <20200116170509.12787-208-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: Niklas Söderlund [ Upstream commit 0bd465765f8d1300040de627f0a0971a8849d654 ] The parallel input initialization error path cleans up the wrong async notifier, fix this by cleaning up the correct notifier. Fixes: 9863bc8695bc36e3 ("media: rcar-vin: Cleanup notifier in error path") Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi Tested-by: Geert Uytterhoeven Reviewed-by: Kieran Bingham Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/rcar-vin/rcar-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index 485fa3fa8b49..c389ba9ba74d 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -631,7 +631,7 @@ static int rvin_parallel_init(struct rvin_dev *vin) ret = v4l2_async_notifier_register(&vin->v4l2_dev, &vin->notifier); if (ret < 0) { vin_err(vin, "Notifier registration failed\n"); - v4l2_async_notifier_cleanup(&vin->group->notifier); + v4l2_async_notifier_cleanup(&vin->notifier); return ret; } -- 2.20.1