Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185679
b: refs/heads/master
c: 598b357
h: refs/heads/master
i:
  185677: 29d2d83
  185675: edec446
  185671: 7e1d89c
  185663: 7834d4c
v: v3
  • Loading branch information
Dmitry Torokhov authored and Liam Girdwood committed Mar 3, 2010
1 parent 16acfb1 commit f132459
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 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: eb66d565e8eb73ab0c471fd3dac822dc663fe8ea
refs/heads/master: 598b3578ab9ee8e3eef322128485719668d8b93b
11 changes: 7 additions & 4 deletions trunk/drivers/regulator/wm8994-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

struct wm8994_ldo {
int enable;
int is_enabled;
bool is_enabled;
struct regulator_dev *regulator;
struct wm8994 *wm8994;
};
Expand All @@ -43,7 +43,7 @@ static int wm8994_ldo_enable(struct regulator_dev *rdev)
return 0;

gpio_set_value(ldo->enable, 1);
ldo->is_enabled = 1;
ldo->is_enabled = true;

return 0;
}
Expand All @@ -57,7 +57,7 @@ static int wm8994_ldo_disable(struct regulator_dev *rdev)
return -EINVAL;

gpio_set_value(ldo->enable, 0);
ldo->is_enabled = 0;
ldo->is_enabled = false;

return 0;
}
Expand Down Expand Up @@ -218,7 +218,7 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)

ldo->wm8994 = wm8994;

ldo->is_enabled = 1;
ldo->is_enabled = true;

if (pdata->ldo[id].enable && gpio_is_valid(pdata->ldo[id].enable)) {
ldo->enable = pdata->ldo[id].enable;
Expand Down Expand Up @@ -263,6 +263,8 @@ static __devexit int wm8994_ldo_remove(struct platform_device *pdev)
{
struct wm8994_ldo *ldo = platform_get_drvdata(pdev);

platform_set_drvdata(pdev, NULL);

regulator_unregister(ldo->regulator);
if (gpio_is_valid(ldo->enable))
gpio_free(ldo->enable);
Expand All @@ -276,6 +278,7 @@ static struct platform_driver wm8994_ldo_driver = {
.remove = __devexit_p(wm8994_ldo_remove),
.driver = {
.name = "wm8994-ldo",
.owner = THIS_MODULE,
},
};

Expand Down

0 comments on commit f132459

Please sign in to comment.