Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308687
b: refs/heads/master
c: f22a9c6
h: refs/heads/master
i:
  308685: f06d14f
  308683: 2dba188
  308679: d07bed2
  308671: 587b31a
v: v3
  • Loading branch information
Paul Parsons authored and Samuel Ortiz committed May 1, 2012
1 parent 84040f3 commit 171452c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 18996db262d0f1e79357315e033ace24488f92ad
refs/heads/master: f22a9c6fd56f0a7b24ee43466e524ad4576c6dfd
6 changes: 6 additions & 0 deletions trunk/drivers/mfd/asic3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,9 @@ static int __init asic3_probe(struct platform_device *pdev)

asic3_mfd_probe(pdev, pdata, mem);

asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT),
(ASIC3_EXTCF_CF0_BUF_EN|ASIC3_EXTCF_CF0_PWAIT_EN), 1);

dev_info(asic->dev, "ASIC3 Core driver\n");

return 0;
Expand All @@ -1021,6 +1024,9 @@ static int __devexit asic3_remove(struct platform_device *pdev)
int ret;
struct asic3 *asic = platform_get_drvdata(pdev);

asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT),
(ASIC3_EXTCF_CF0_BUF_EN|ASIC3_EXTCF_CF0_PWAIT_EN), 0);

asic3_mfd_remove(pdev);

ret = asic3_gpio_remove(pdev);
Expand Down

0 comments on commit 171452c

Please sign in to comment.