From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 10 Dec 2012 03:42:57 +0000 (+0900)
Subject: Merge remote-tracking branch 'regulator/topic/lp8788' into regulator-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8bfb69e77591c4811acbf30618cc07db9c001fc;p=linux-beck.git

Merge remote-tracking branch 'regulator/topic/lp8788' into regulator-next
---

a8bfb69e77591c4811acbf30618cc07db9c001fc
diff --cc drivers/regulator/lp8788-ldo.c
index 26753a013789,40897eb2c29e..3792741708ce
--- a/drivers/regulator/lp8788-ldo.c
+++ b/drivers/regulator/lp8788-ldo.c
@@@ -708,11 -700,10 +700,10 @@@ static int lp8788_config_ldo_enable_mod
  	return ret;
  
  set_default_ldo_enable_mode:
- 	return lp8788_update_bits(lp, LP8788_EN_SEL, en_mask[enable_id],
- 				val[enable_id]);
+ 	return lp8788_update_bits(lp, LP8788_EN_SEL, en_mask[enable_id], 0);
  }
  
 -static __devinit int lp8788_dldo_probe(struct platform_device *pdev)
 +static int lp8788_dldo_probe(struct platform_device *pdev)
  {
  	struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
  	int id = pdev->id;