From patchwork Tue May 5 07:50:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 63593 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1jVsIg-00CPXt-Hv; Tue, 05 May 2020 07:47:34 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728510AbgEEHur (ORCPT + 1 other); Tue, 5 May 2020 03:50:47 -0400 Received: from smtp11.smtpout.orange.fr ([80.12.242.133]:27954 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725320AbgEEHuq (ORCPT ); Tue, 5 May 2020 03:50:46 -0400 Received: from localhost.localdomain ([93.23.13.215]) by mwinf5d34 with ME id avqb2200p4ePWwV03vqcd5; Tue, 05 May 2020 09:50:45 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Tue, 05 May 2020 09:50:45 +0200 X-ME-IP: 93.23.13.215 From: Christophe JAILLET To: jernej.skrabec@siol.net, mchehab@kernel.org, mripard@kernel.org, wens@csie.org, hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] media: sun8i: Fix an error handling path in 'deinterlace_runtime_resume()' Date: Tue, 5 May 2020 09:50:34 +0200 Message-Id: <20200505075034.168296-1-christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no It is spurious to call 'clk_disable_unprepare()' when 'clk_prepare_enable()' has not been called yet. Re-order the error handling path to avoid it. Fixes: a4260ea49547 ("media: sun4i: Add H3 deinterlace driver") Signed-off-by: Christophe JAILLET Acked-by: Chen-Yu Tsai --- drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c index d78f6593ddd1..a1f29462d260 100644 --- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c +++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c @@ -969,14 +969,14 @@ static int deinterlace_runtime_resume(struct device *device) return 0; -err_exlusive_rate: - clk_rate_exclusive_put(dev->mod_clk); err_ram_clk: clk_disable_unprepare(dev->ram_clk); err_mod_clk: clk_disable_unprepare(dev->mod_clk); err_bus_clk: clk_disable_unprepare(dev->bus_clk); +err_exlusive_rate: + clk_rate_exclusive_put(dev->mod_clk); return ret; }