Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1386303

[PATCH v6 1/4] i2c: tegra: disable clock before returning error

Show all headers | View raw

Disable clock before returning error in tegra_i2c_init()

Signed-off-by: Shardar Shariff Md <smohammed@nvidia.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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v6 1/4] i2c: tegra: disable clock before returning error Shardar Shariff Md <smohammed@nvidia.com> - 2016-04-25 14:00 +0200
  [PATCH v6 4/4] i2c: tegra: proper handling of error cases Shardar Shariff Md <smohammed@nvidia.com> - 2016-04-25 14:00 +0200
  [PATCH v6 2/4] i2c: tegra: calculate timeout for config load when needed Shardar Shariff Md <smohammed@nvidia.com> - 2016-04-25 14:00 +0200
  Re: [PATCH v6 1/4] i2c: tegra: disable clock before returning error Jon Hunter <jonathanh@nvidia.com> - 2016-04-25 14:40 +0200

csiph-web