From 4ee031dcfba5b29e11482a6d01741359b380bb33 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 15 May 2012 00:12:10 +0800 Subject: [PATCH] --- yaml --- r: 302288 b: refs/heads/master c: 0f65402b2593cae129dcdb67f6ad79d5dc2ac017 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8649.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9a0f8db3115f..e3c52f6aafb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be15411d97b6b9b2883b7f1ec52ef03bc770a6d4 +refs/heads/master: 0f65402b2593cae129dcdb67f6ad79d5dc2ac017 diff --git a/trunk/drivers/regulator/max8649.c b/trunk/drivers/regulator/max8649.c index 4ce72081c2e3..3b73a7f4aed1 100644 --- a/trunk/drivers/regulator/max8649.c +++ b/trunk/drivers/regulator/max8649.c @@ -76,7 +76,7 @@ static int max8649_list_voltage(struct regulator_dev *rdev, unsigned index) return (MAX8649_DCDC_VMIN + index * MAX8649_DCDC_STEP); } -static int max8649_get_voltage(struct regulator_dev *rdev) +static int max8649_get_voltage_sel(struct regulator_dev *rdev) { struct max8649_regulator_info *info = rdev_get_drvdata(rdev); unsigned int val; @@ -87,7 +87,7 @@ static int max8649_get_voltage(struct regulator_dev *rdev) if (ret != 0) return ret; data = (unsigned char)val & MAX8649_VOL_MASK; - return max8649_list_voltage(rdev, data); + return data; } static int max8649_set_voltage(struct regulator_dev *rdev, @@ -196,7 +196,7 @@ static unsigned int max8649_get_mode(struct regulator_dev *rdev) static struct regulator_ops max8649_dcdc_ops = { .set_voltage = max8649_set_voltage, - .get_voltage = max8649_get_voltage, + .get_voltage_sel = max8649_get_voltage_sel, .list_voltage = max8649_list_voltage, .enable = max8649_enable, .disable = max8649_disable,