[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1461585458-23948-1-git-send-email-smohammed@nvidia.com>
Date: Mon, 25 Apr 2016 17:27:35 +0530
From: Shardar Shariff Md <smohammed@...dia.com>
To: <ldewangan@...dia.com>, <wsa@...-dreams.de>,
<swarren@...dotorg.org>, <thierry.reding@...il.com>,
<gnurou@...il.com>, <linux-i2c@...r.kernel.org>,
<linux-tegra@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<jonathanh@...dia.com>
CC: Shardar Shariff Md <smohammed@...dia.com>
Subject: [PATCH v6 1/4] i2c: tegra: disable clock before returning error
Disable clock before returning error in tegra_i2c_init()
Signed-off-by: Shardar Shariff Md <smohammed@...dia.com>
---
Changes in v5:
- Move current patch as separate patch
Changes in v6:
- Remove unnecessary line
---
drivers/i2c/busses/i2c-tegra.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index d764d64..445398c3 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -483,19 +483,20 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
if (time_after(jiffies, timeout)) {
dev_warn(i2c_dev->dev,
"timeout waiting for config load\n");
- return -ETIMEDOUT;
+ err = -ETIMEDOUT;
+ goto err;
}
msleep(1);
}
}
- tegra_i2c_clock_disable(i2c_dev);
-
if (i2c_dev->irq_disabled) {
i2c_dev->irq_disabled = 0;
enable_irq(i2c_dev->irq);
}
+err:
+ tegra_i2c_clock_disable(i2c_dev);
return err;
}
--
1.8.1.5
Powered by blists - more mailing lists