Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 373201
b: refs/heads/master
c: c25feaa
h: refs/heads/master
i:
  373199: fef85c2
v: v3
  • Loading branch information
Charles Keepax authored and Samuel Ortiz committed Apr 8, 2013
1 parent 146a244 commit 0ddab76
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 87d3af4ac0554afc2e86069d7578f74b12f3f67a
refs/heads/master: c25feaa53cca696321540ca0f8564bf484224cac
6 changes: 5 additions & 1 deletion trunk/drivers/mfd/arizona-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,10 @@ int arizona_dev_init(struct arizona *arizona)
goto err_enable;
}

if (arizona->pdata.reset)
if (arizona->pdata.reset) {
gpio_set_value_cansleep(arizona->pdata.reset, 1);
msleep(1);
}

regcache_cache_only(arizona->regmap, false);

Expand Down Expand Up @@ -589,6 +591,8 @@ int arizona_dev_init(struct arizona *arizona)
goto err_reset;
}

msleep(1);

ret = regcache_sync(arizona->regmap);
if (ret != 0) {
dev_err(dev, "Failed to sync device: %d\n", ret);
Expand Down

0 comments on commit 0ddab76

Please sign in to comment.