From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Thu, 2 Sep 2010 04:07:07 +0000 (-0700)
Subject: w1: master: tegra_w1: Hold the mutex around w1_setup as well
X-Git-Tag: firefly_0821_release~9834^2~606
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cbcebda4a10c336b01fa2f7c7cb300bde6f7d2b0;p=firefly-linux-kernel-4.4.55.git

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 3d1e1dc82180..209265446381 100644
--- 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;