w1: master: tegra_w1: Hold the mutex around w1_setup as well

Change-Id: I4989ebd892e35e0fdd49bd529ac8bc4f54a8f15e
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

diff --git a/drivers/w1/masters/tegra_w1.c b/drivers/w1/masters/tegra_w1.c
index 3d1e1dc82180656d004c1eaf62fc1fe36bc2423d..209265446381b8ebc56b003b713396c419efd543 100644 (file)
--- a/drivers/w1/masters/tegra_w1.c
+++ b/drivers/w1/masters/tegra_w1.c
@@ -463,8 +463,8 @@ static int tegra_w1_resume(struct platform_device *pdev)
        struct tegra_device *dev = platform_get_drvdata(pdev);
 
        /* TODO: Is this necessary? I would assume yes. */
-       w1_setup(dev);
        mutex_lock(&dev->mutex);
+       w1_setup(dev);
        dev->ready = true;
        mutex_unlock(&dev->mutex);
        return 0;