From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935650AbdGTKsl (ORCPT ); Thu, 20 Jul 2017 06:48:41 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36357 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934348AbdGTKsi (ORCPT ); Thu, 20 Jul 2017 06:48:38 -0400 From: Johan Hovold To: Thierry Reding Cc: linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/2] pwm: tiehrpwm: fix clock imbalance in probe error path Date: Thu, 20 Jul 2017 12:48:17 +0200 Message-Id: <20170720104817.25726-2-johan@kernel.org> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170720104817.25726-1-johan@kernel.org> References: <20170720104817.25726-1-johan@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure to unprepare the clock before returning on late probe errors. Fixes: b388f15fd14c ("pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.") Signed-off-by: Johan Hovold --- drivers/pwm/pwm-tiehrpwm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c index 6e51a075d1a7..387eaf1bac85 100644 --- a/drivers/pwm/pwm-tiehrpwm.c +++ b/drivers/pwm/pwm-tiehrpwm.c @@ -489,13 +489,18 @@ static int ehrpwm_pwm_probe(struct platform_device *pdev) ret = pwmchip_add(&pc->chip); if (ret < 0) { dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret); - return ret; + goto err_clk_unprepare; } pm_runtime_enable(&pdev->dev); platform_set_drvdata(pdev, pc); return 0; + +err_clk_unprepare: + clk_unprepare(pc->tbclk); + + return ret; } static int ehrpwm_pwm_remove(struct platform_device *pdev) -- 2.13.3