---

yaml --- r: 319756 b: refs/heads/master c: af65a36 h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · d5ae6fc · d5ae6fc
1 parent 167b5e6
commit d5ae6fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31b3ffbdfb4e4d2d2416c30fe02da3e58e37d798
+refs/heads/master: af65a361d543100962c03cc4cdb7333b14c9d119
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
@@ -398,7 +398,11 @@ int __devinit arizona_dev_init(struct arizona *arizona)
 		}
 	}
 
-	arizona_wait_for_boot(arizona);
+	ret = arizona_wait_for_boot(arizona);
+	if (ret != 0) {
+		dev_err(arizona->dev, "Device failed initial boot: %d\n", ret);
+		goto err_reset;
+	}
 
 	for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
 		if (!arizona->pdata.gpio_defaults[i])