---

yaml --- r: 179587 b: refs/heads/master c: 1e02b2c h: refs/heads/master i: 179585: 3a7701f 179583: 3a80cd9 v: v3
git-mirror · Jan 18, 2010 · 3907fbc · 3907fbc
1 parent 1a1b215
commit 3907fbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e6ba2dfa2d6c4691a83a63e211990a8bd7b788b
+refs/heads/master: 1e02b2c32484bfe0c5564d9be060b7d9821307b9
diff --git a/trunk/drivers/mfd/mc13783-core.c b/trunk/drivers/mfd/mc13783-core.c
@@ -619,6 +619,8 @@ static int mc13783_probe(struct spi_device *spi)
 	}
 	/* This should go away (END) */
 
+	mc13783_unlock(mc13783);
+
 	if (pdata->flags & MC13783_USE_ADC)
 		mc13783_add_subdevice(mc13783, "mc13783-adc");
 
@@ -641,8 +643,6 @@ static int mc13783_probe(struct spi_device *spi)
 	if (pdata->flags & MC13783_USE_TOUCHSCREEN)
 		mc13783_add_subdevice(mc13783, "mc13783-ts");
 
-	mc13783_unlock(mc13783);
-
 	return 0;
 }