diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/regulator/bq24022.c | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/regulator/bq24022.c')
| -rw-r--r-- | drivers/regulator/bq24022.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c index 7ecb820ceebc..d08cd9b66c6d 100644 --- a/drivers/regulator/bq24022.c +++ b/drivers/regulator/bq24022.c | |||
| @@ -61,8 +61,7 @@ static int bq24022_disable(struct regulator_dev *rdev) | |||
| 61 | 61 | ||
| 62 | static int bq24022_is_enabled(struct regulator_dev *rdev) | 62 | static int bq24022_is_enabled(struct regulator_dev *rdev) |
| 63 | { | 63 | { |
| 64 | struct platform_device *pdev = rdev_get_drvdata(rdev); | 64 | struct bq24022_mach_info *pdata = rdev_get_drvdata(rdev); |
| 65 | struct bq24022_mach_info *pdata = pdev->dev.platform_data; | ||
| 66 | 65 | ||
| 67 | return !gpio_get_value(pdata->gpio_nce); | 66 | return !gpio_get_value(pdata->gpio_nce); |
| 68 | } | 67 | } |