Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2372589pxu; Mon, 14 Dec 2020 00:05:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkhT/YD0oWY42M3VJpJzZJlb1jDnyDMHS0WDCzSwq+FyBByjIxGOkBhDt8pxmTfEphCPSH X-Received: by 2002:a17:906:369b:: with SMTP id a27mr22048744ejc.183.1607933139578; Mon, 14 Dec 2020 00:05:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607933139; cv=none; d=google.com; s=arc-20160816; b=gojT3y11E4YESWmh6AFBxQay7Zz2bPnJYaeHhRuvk7A+XBPXNVtcYUHasyuQoltOpz 6kcSF1I6zcNtUv1cDZZY1BbOC6AxLQlEnYtHmPm9CIsScV0kzmYojJTWJGbPkMA79qIX 5J2pMGSv+fPQlKg+9bfjJZWb+FZQaR0FnJOqUPCqivrLN7AuW0sOp6tpUoJlVEb0N/cD YQJi7nKTxvR3lBQFAiNLUBAYdfJeE+TKn9LdvAvWGpCHWz0QW9WC0vOQawApCe2v1e/c JeReFYO5Dn1CYtaL7sNreGPgf0/ckehovImsvckLwMjqktCrtrQ0rcwQ0dpVqTRbsaW1 s78w== 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 :message-id:date:subject:cc:to:from; bh=CWZL74xl4dV+BC3Vi87/Pk1SbW60a7uJm/vQ801TOPI=; b=xn6NTHUP7NPcB1QKSONNghVxkLDWvGguspBoW88XFGw6WSCa6TZ6wv3iGrPkBybVrY jiBFBpygSboghK8EIeFZCc23u/o1oFOtbdRBUURP5TS7JFnbiN/P2EiOMjoZqkO3jbNc C02RzPujqxUdWuktgcGYY3QK/9YmdKIudtr6mOG/Jg0nNNjKmL/FtS+GFZ1W3Dyp74O+ tJpXfLMDci+lhmbmMzcSX+DTyZRPnJPNDlrUIrozWDYLLKNwQl31rqCEtjQtL5oOz4O1 N2qvRv+fgEvlIueH5L7ioV2Tfd02g2fEE9P/SG0e3k93/Q6MT3Jo9tkQKoux6S9DVEst PEJA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y17si920078edi.83.2020.12.14.00.05.16; Mon, 14 Dec 2020 00:05:39 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439528AbgLLRo2 (ORCPT + 99 others); Sat, 12 Dec 2020 12:44:28 -0500 Received: from smtp07.smtpout.orange.fr ([80.12.242.129]:43701 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407700AbgLLRnF (ORCPT ); Sat, 12 Dec 2020 12:43:05 -0500 Received: from localhost.localdomain ([93.22.133.216]) by mwinf5d65 with ME id 3VhJ2400K4gHbkV03VhKYs; Sat, 12 Dec 2020 18:41:20 +0100 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 12 Dec 2020 18:41:20 +0100 X-ME-IP: 93.22.133.216 From: Christophe JAILLET To: laurent.pinchart@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] media: vsp1: Fix an error handling path in the probe function Date: Sat, 12 Dec 2020 18:41:19 +0100 Message-Id: <20201212174119.120027-1-christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A previous 'rcar_fcp_get()' call must be undone in the error handling path, as already done in the remove function. Fixes: 94fcdf829793 ("[media] v4l: vsp1: Add FCP support") Signed-off-by: Christophe JAILLET --- drivers/media/platform/vsp1/vsp1_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c index dc62533cf32c..aa66e4f5f3f3 100644 --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c @@ -882,8 +882,10 @@ static int vsp1_probe(struct platform_device *pdev) } done: - if (ret) + if (ret) { pm_runtime_disable(&pdev->dev); + rcar_fcp_put(vsp1->fcp); + } return ret; } -- 2.27.0