diff options
| author | Mark Brown | 2012-07-02 19:24:59 +0200 |
|---|---|---|
| committer | Mark Brown | 2012-07-02 19:24:59 +0200 |
| commit | 744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80 (patch) | |
| tree | e7c47e2e9aa8f6184cb5b20bde2e4fda96a3bb59 /drivers/regulator/tps6524x-regulator.c | |
| parent | regulator: fixed: support deferred probe for DT GPIOs (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | kernel-qcow2-linux-744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80.tar.gz kernel-qcow2-linux-744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80.tar.xz kernel-qcow2-linux-744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80.zip | |
Merge tag 'v3.5-rc5' into regulator-drivers
Linux 3.5-rc5 collides with further development.
Conflicts:
drivers/regulator/tps65023-regulator.c
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) |