From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751911AbcF0J3D (ORCPT ); Mon, 27 Jun 2016 05:29:03 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:17719 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751714AbcF0J3A (ORCPT ); Mon, 27 Jun 2016 05:29:00 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 27 Jun 2016 02:27:50 -0700 Subject: Re: [PATCH] i2c: tegra: Correct error path in probe To: Laxman Dewangan , Wolfram Sang , Stephen Warren , Thierry Reding , Alexandre Courbot References: <1465936007-18599-1-git-send-email-jonathanh@nvidia.com> CC: Shardar Shariff Md , , , From: Jon Hunter Message-ID: <5770F1D4.8000406@nvidia.com> Date: Mon, 27 Jun 2016 10:28:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <1465936007-18599-1-git-send-email-jonathanh@nvidia.com> X-Originating-IP: [10.21.132.149] X-ClientProxiedBy: UKMAIL102.nvidia.com (10.26.138.15) To UKMAIL102.nvidia.com (10.26.138.15) Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On 14/06/16 21:26, Jon Hunter wrote: > Commit 497fbe24987b ("i2c: tegra: enable multi master mode for tegra210") > enables the Tegra I2C 'div_clk' for adapters using the multi-master mode > during the device probe. Although the probe error path was updated to > disable the clock on probe failure, there is one place after calling > tegra_i2c_init() where the clock will not be disabled on failure. Correct > the error path so that the 'div_clk' is disabled if calling > tegra_i2c_init() fails. > > Fixes: 497fbe24987b ("i2c: tegra: enable multi master mode for tegra210") > > Signed-off-by: Jon Hunter > --- > drivers/i2c/busses/i2c-tegra.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c > index 445398c314a3..b126dbaa47e3 100644 > --- a/drivers/i2c/busses/i2c-tegra.c > +++ b/drivers/i2c/busses/i2c-tegra.c > @@ -912,7 +912,7 @@ static int tegra_i2c_probe(struct platform_device *pdev) > ret = tegra_i2c_init(i2c_dev); > if (ret) { > dev_err(&pdev->dev, "Failed to initialize i2c controller"); > - goto unprepare_div_clk; > + goto disable_div_clk; > } > > ret = devm_request_irq(&pdev->dev, i2c_dev->irq, Any feedback on this? Jon -- nvpublic