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=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 08E4CC35242 for ; Fri, 24 Jan 2020 11:27:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2AA82075D for ; Fri, 24 Jan 2020 11:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865269; bh=X6KHqZed0cZZ5GRpXrqxZDyc5oNFbNlmfzErILPwf6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2hIr1fo1fkqE+hQa/Eo0pNzzkQyD7ycRJYY6oGLWZ3VvqxZB6iVlO/pEF30bc3a1k he1XPH6hkdlsa7Fz0o1uOvNPEbbGaKCDG0MKX8d2jXdDBakZegqBKw7xwinx8wywOp mNZVk7nRUc9x1Ampf9t2+8DVJbPX1pHX5XREGp0s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391243AbgAXL1s (ORCPT ); Fri, 24 Jan 2020 06:27:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:43582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391675AbgAXL1r (ORCPT ); Fri, 24 Jan 2020 06:27:47 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 1B9D620718; Fri, 24 Jan 2020 11:27:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865266; bh=X6KHqZed0cZZ5GRpXrqxZDyc5oNFbNlmfzErILPwf6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c9Xw4eAVvfvw9seMbjNxymAnTB0SHrqj5Juv7mtKpW+Rns9bnHabgFAjXjTBMsrPm K474Ss4E4gpL4L06eduFFHCJhknxgwIbJBoLOFabscFEBZ3UtiVBnUfCLu039qyEFw qk0jZ1AXlKck4mttsjHwzkm01zogpiQYBkvplNMs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Jacopo Mondi , Geert Uytterhoeven , Kieran Bingham , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 486/639] media: rcar-vin: Clean up correct notifier in error path Date: Fri, 24 Jan 2020 10:30:56 +0100 Message-Id: <20200124093149.593453726@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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: 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 485fa3fa8b49a..c389ba9ba74d2 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