From d5ae6fc8fdef75275bbcc5c7537b67ffa316d1b9 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 9 Jul 2012 11:56:43 +0100 Subject: [PATCH] --- yaml --- r: 319756 b: refs/heads/master c: af65a361d543100962c03cc4cdb7333b14c9d119 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/arizona-core.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 635f9ac5e310..1f0565670fdd 100644 --- 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 index 5cbacf6e2bf7..ffa011f4677e 100644 --- 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])