From d560be9ffbcf0593f7c63febd22e95a2d6d9322d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 23 Sep 2010 18:20:15 -0700 Subject: [PATCH] w1: tegra_w1: Don't disable clock if it was not enabled Change-Id: I634c24768979fc2c9754f9b1d946dcb1ef1ff213 Signed-off-by: Colin Cross --- drivers/w1/masters/tegra_w1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/w1/masters/tegra_w1.c b/drivers/w1/masters/tegra_w1.c index 209265446381..4da9c4e7acf8 100644 --- a/drivers/w1/masters/tegra_w1.c +++ b/drivers/w1/masters/tegra_w1.c @@ -252,7 +252,7 @@ static u8 tegra_w1_touch_bit(void *data, u8 bit) return_bit = 0; mutex_lock(&dev->mutex); if (!dev->ready) - goto done; + goto done_unlock; clk_enable(dev->clk); w1_imask(dev, OI_BIT_XFER_DONE); @@ -292,6 +292,7 @@ done: w1_imask(dev, 0); dev->transfer_completion = NULL; clk_disable(dev->clk); +done_unlock: mutex_unlock(&dev->mutex); return return_bit; } -- 2.34.1