From: Colin Cross <ccross@android.com>
Date: Fri, 24 Sep 2010 01:20:15 +0000 (-0700)
Subject: w1: tegra_w1: Don't disable clock if it was not enabled
X-Git-Tag: firefly_0821_release~9834^2~518
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d560be9ffbcf0593f7c63febd22e95a2d6d9322d;p=firefly-linux-kernel-4.4.55.git

w1: tegra_w1: Don't disable clock if it was not enabled

Change-Id: I634c24768979fc2c9754f9b1d946dcb1ef1ff213
Signed-off-by: Colin Cross <ccross@android.com>
---

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;
 }