From b92348c474e094f83cfad0385790685b62870f59 Mon Sep 17 00:00:00 2001 From: Kishon Vijay Abraham I Date: Thu, 30 May 2013 15:55:09 +0530 Subject: [PATCH] --- yaml --- r: 376581 b: refs/heads/master c: f232168df0c7e7414b70ac5d8fed83086d441c0b h: refs/heads/master i: 376579: de785172ecfb6c316f51b8b5caea0387e06ce57f v: v3 --- [refs] | 2 +- trunk/drivers/regulator/palmas-regulator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c125484ced62..889417b8f09b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f4d6364084ca0525591836eba4a59f04bb85c68 +refs/heads/master: f232168df0c7e7414b70ac5d8fed83086d441c0b diff --git a/trunk/drivers/regulator/palmas-regulator.c b/trunk/drivers/regulator/palmas-regulator.c index ced74167a600..3ae44ac12a94 100644 --- a/trunk/drivers/regulator/palmas-regulator.c +++ b/trunk/drivers/regulator/palmas-regulator.c @@ -878,7 +878,7 @@ static int palmas_regulators_probe(struct platform_device *pdev) pmic->desc[id].vsel_mask = SMPS10_VSEL; pmic->desc[id].enable_reg = PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, - PALMAS_SMPS10_STATUS); + PALMAS_SMPS10_CTRL); pmic->desc[id].enable_mask = SMPS10_BOOST_EN; pmic->desc[id].min_uV = 3750000; pmic->desc[id].uV_step = 1250000;