| Message ID | 1461585458-23948-1-git-send-email-smohammed@nvidia.com |
|---|---|
| State | Superseded |
| Headers | show |
On 25/04/16 12:57, Shardar Shariff Md wrote: > Disable clock before returning error in tegra_i2c_init() May be explain why we should do this? It looks like currently we will leave the clock on in the case of an error and so we may never turn it off again as now we have an unbalanced enable/disable, etc. > 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); Thierry, Stephen, thinking about this some more I wonder if we should not change the order here, in case of a potential race between an interrupt and disabling the clock. May be it is safer to disable the clock first? However, this is in the init and so may be that is not likely? Cheers Jon -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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(-)