w1: tegra_w1: Don't disable clock if it was not enabled
authorColin Cross <ccross@android.com>
Fri, 24 Sep 2010 01:20:15 +0000 (18:20 -0700)
committerColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:03:11 +0000 (17:03 -0700)
Change-Id: I634c24768979fc2c9754f9b1d946dcb1ef1ff213
Signed-off-by: Colin Cross <ccross@android.com>
drivers/w1/masters/tegra_w1.c

index 209265446381b8ebc56b003b713396c419efd543..4da9c4e7acf8186cb40918df99c0bfd6cb5ac342 100644 (file)
@@ -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;
 }