Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / regulator / pcap-regulator.c

diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c
index 29d0566379ae452fb3a771747b49abad92a73333..31f6e11a7f16f6c1621e99bcc2b3b8d4704cd224 100644 (file)
--- a/drivers/regulator/pcap-regulator.c
+++ b/drivers/regulator/pcap-regulator.c
@@ -151,7 +151,8 @@ static struct pcap_regulator vreg_table[] = {
 };
 
 static int pcap_regulator_set_voltage(struct regulator_dev *rdev,
-                                               int min_uV, int max_uV)
+                                     int min_uV, int max_uV,
+                                     unsigned *selector)
 {
        struct pcap_regulator *vreg = &vreg_table[rdev_get_id(rdev)];
        void *pcap = rdev_get_drvdata(rdev);
@@ -170,10 +171,12 @@ static int pcap_regulator_set_voltage(struct regulator_dev *rdev,
                        i = 0;
 
                uV = vreg->voltage_table[i] * 1000;
-               if (min_uV <= uV && uV <= max_uV)
+               if (min_uV <= uV && uV <= max_uV) {
+                       *selector = i;
                        return ezx_pcap_set_bits(pcap, vreg->reg,
                                        (vreg->n_voltages - 1) << vreg->index,
                                        i << vreg->index);
+               }
 
                if (i == 0 && rdev_get_id(rdev) == V1)
                        i = vreg->n_voltages - 1;