diff options
| author | merge <null@invalid> | 2008-12-11 17:19:32 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-11 17:19:32 +0000 |
| commit | de473ca893c9285ab2dd3ea82973e6f253eaec1d (patch) | |
| tree | 5824c69cfba3cfd461851c601b294ecf0b41d846 /drivers/regulator | |
| parent | b3c6cd4348a8a97c010be15faeadce2e783c7d33 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-config-kill-evbug-patch-1229015794
pending-tracking-hist top was MERGE-via-stable-tracking-config-kill-evbug-patch-1229015794 / cf65aecd5f77e51a244ff4647afa409056c3d725 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-config-kill-evbug-patch
stable-tracking-hist top was config-kill-evbug-patch / 16e183d5b9b5e0bc6d14877a8815e91d9000792e ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
config-kill-evbug.patch
Reported-by: Klaus Kurzmann <mok@mnet-online.de>
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/pcf50633-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index f8e1fafb03f..343f43e2392 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c @@ -189,7 +189,7 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev) return -EINVAL; } - return rc; + return rc * 1000; } static int pcf50633_regulator_enable(struct regulator_dev *rdev) |