diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 21:41:33 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 21:41:33 +0200 |
| commit | 43cb4a02d27ad9525ad23984d4fd06972810439f (patch) | |
| tree | c705d059616356054d18c6cd50e7c9f5b16a5747 /drivers/regulator/tps6524x-regulator.c | |
| parent | 9abf29edbb14a34f86c9e09970adada9f10ccbcf (diff) | |
| parent | 759af179c72005e61a4dd6dcf909320a134bfeee (diff) | |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into late/boardboards2
From Haojian Zhuang <haojian.zhuang@gmail.com>:
* 'board-specific' of git://github.com/hzhuang1/linux:
ARM: pxa: hx4700: Use DEFINE_RES_* macros consistently
ARM: pxa: remove eseries.h
It seems I missed this in the original pull requests for v3.6, adding
it now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/regulator/tps6524x-regulator.c')
| -rw-r--r-- | drivers/regulator/tps6524x-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c index b88b3df82381..1b299aacf22f 100644 --- a/drivers/regulator/tps6524x-regulator.c +++ b/drivers/regulator/tps6524x-regulator.c @@ -482,7 +482,7 @@ static int get_voltage_sel(struct regulator_dev *rdev) info = &supply_info[rdev_get_id(rdev)]; if (info->flags & FIXED_VOLTAGE) - return info->fixed_voltage; + return 0; ret = read_field(hw, &info->voltage); if (ret < 0) |