aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/da9055-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2012-11-15 11:35:14 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-15 19:46:57 -0500
commit26cbd3073394b966654294c8cb9cb2fec870c567 (patch)
tree6d9b035d8ca27d4f4f1db8a171682ed843082056 /drivers/regulator/da9055-regulator.c
parentf6130be652d0b4fbf710d83a816298c007e59ed1 (diff)
regulator: da9055: Fix checking wrong value in da9055_gpio_init
Check pdata->gpio_rsel && pdata->gpio_rsel[id] for the case GPI pin is muxed with regulator to select the regulator register set A/B for voltage ramping. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/da9055-regulator.c')
-rw-r--r--drivers/regulator/da9055-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c
index 8994178b371c..79c56655b9b3 100644
--- a/drivers/regulator/da9055-regulator.c
+++ b/drivers/regulator/da9055-regulator.c
@@ -501,7 +501,7 @@ static __devinit int da9055_gpio_init(struct da9055_regulator *regulator,
501 goto err; 501 goto err;
502 } 502 }
503 503
504 if (pdata->gpio_rsel && pdata->gpio_ren[id]) { 504 if (pdata->gpio_rsel && pdata->gpio_rsel[id]) {
505 char name[18]; 505 char name[18];
506 int gpio_mux = pdata->gpio_rsel[id]; 506 int gpio_mux = pdata->gpio_rsel[id];
507 507