From 65aac9cc9810710e63ab25eac78f27d357e3b607 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 14 May 2012 10:34:50 +0800 Subject: [PATCH] --- yaml --- r: 302281 b: refs/heads/master c: 3c8983b9ac2f8bf9f23effa4f72ce814f8375397 h: refs/heads/master i: 302279: 73f5afe9edbaefce887d68dfdca4cb30835299a3 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8925-regulator.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 160db64d949f..219b4f0fb442 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e81dba85c6388dfabcb76cbc2b8bd02836a53ae5 +refs/heads/master: 3c8983b9ac2f8bf9f23effa4f72ce814f8375397 diff --git a/trunk/drivers/regulator/max8925-regulator.c b/trunk/drivers/regulator/max8925-regulator.c index de30ea2b80f5..529ee4152f11 100644 --- a/trunk/drivers/regulator/max8925-regulator.c +++ b/trunk/drivers/regulator/max8925-regulator.c @@ -78,7 +78,7 @@ static int max8925_set_voltage(struct regulator_dev *rdev, return max8925_set_bits(info->i2c, info->vol_reg, mask, data); } -static int max8925_get_voltage(struct regulator_dev *rdev) +static int max8925_get_voltage_sel(struct regulator_dev *rdev) { struct max8925_regulator_info *info = rdev_get_drvdata(rdev); unsigned char data, mask; @@ -90,7 +90,7 @@ static int max8925_get_voltage(struct regulator_dev *rdev) mask = rdev->desc->n_voltages - 1; data = ret & mask; - return max8925_list_voltage(rdev, data); + return data; } static int max8925_enable(struct regulator_dev *rdev) @@ -162,7 +162,7 @@ static int max8925_set_dvm_disable(struct regulator_dev *rdev) static struct regulator_ops max8925_regulator_sdv_ops = { .list_voltage = max8925_list_voltage, .set_voltage = max8925_set_voltage, - .get_voltage = max8925_get_voltage, + .get_voltage_sel = max8925_get_voltage_sel, .enable = max8925_enable, .disable = max8925_disable, .is_enabled = max8925_is_enabled, @@ -174,7 +174,7 @@ static struct regulator_ops max8925_regulator_sdv_ops = { static struct regulator_ops max8925_regulator_ldo_ops = { .list_voltage = max8925_list_voltage, .set_voltage = max8925_set_voltage, - .get_voltage = max8925_get_voltage, + .get_voltage_sel = max8925_get_voltage_sel, .enable = max8925_enable, .disable = max8925_disable, .is_enabled = max8925_is_enabled,