From 3971cad8ff464a579cbe579e6fdeddb1eb3f8a41 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 28 Mar 2012 19:46:39 +0800 Subject: [PATCH] --- yaml --- r: 302135 b: refs/heads/master c: 4af7c1d313a085268d071da6729c4ed055be934f h: refs/heads/master i: 302133: dc3ff89e121a04203a744ecf9bfb9a5c21cbcd18 302131: c11dff1f91be318426bebbacdee1ad01ed89f350 302127: c2cddf623bcdca529dfad9e84c7d84297dad9407 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps6524x-regulator.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8901f8dcbf25..ed3e5d965693 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8ee33936f07d49b8e902920e7a5950ac2118d6a +refs/heads/master: 4af7c1d313a085268d071da6729c4ed055be934f diff --git a/trunk/drivers/regulator/tps6524x-regulator.c b/trunk/drivers/regulator/tps6524x-regulator.c index 3a4a1d550db0..2a828a07386a 100644 --- a/trunk/drivers/regulator/tps6524x-regulator.c +++ b/trunk/drivers/regulator/tps6524x-regulator.c @@ -472,7 +472,7 @@ static int set_voltage_sel(struct regulator_dev *rdev, unsigned selector) return write_field(hw, &info->voltage, selector); } -static int get_voltage(struct regulator_dev *rdev) +static int get_voltage_sel(struct regulator_dev *rdev) { const struct supply_info *info; struct tps6524x *hw; @@ -490,7 +490,7 @@ static int get_voltage(struct regulator_dev *rdev) if (WARN_ON(ret >= info->n_voltages)) return -EIO; - return info->voltages[ret]; + return ret; } static int set_current_limit(struct regulator_dev *rdev, int min_uA, @@ -575,7 +575,7 @@ static struct regulator_ops regulator_ops = { .is_enabled = is_supply_enabled, .enable = enable_supply, .disable = disable_supply, - .get_voltage = get_voltage, + .get_voltage_sel = get_voltage_sel, .set_voltage_sel = set_voltage_sel, .list_voltage = list_voltage, .set_current_limit = set_current_limit,