From: Tony Lindgren <tony@atomide.com>
Date: Thu, 24 Sep 2015 23:23:20 +0000 (-0700)
Subject: Merge commit 'b8c93646fd5c' into omap-for-v4.3/fixes
X-Git-Tag: v4.14-rc1~4617^2~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bbc2bc1a4e81c1a3522b3bd9d43fffd2eca8c9e;p=platform%2Fkernel%2Flinux-rpi.git

Merge commit 'b8c93646fd5c' into omap-for-v4.3/fixes
---

4bbc2bc1a4e81c1a3522b3bd9d43fffd2eca8c9e
diff --cc drivers/regulator/pbias-regulator.c
index 4fa7bca,c21cedb..f9d74d6
--- a/drivers/regulator/pbias-regulator.c
+++ b/drivers/regulator/pbias-regulator.c
@@@ -158,12 -198,11 +202,12 @@@ static int pbias_regulator_probe(struc
  		drvdata[data_idx].desc.volt_table = pbias_volt_table;
  		drvdata[data_idx].desc.n_voltages = 2;
  		drvdata[data_idx].desc.enable_time = info->enable_time;
- 		drvdata[data_idx].desc.vsel_reg = res->start;
+ 		drvdata[data_idx].desc.vsel_reg = offset;
  		drvdata[data_idx].desc.vsel_mask = info->vmode;
- 		drvdata[data_idx].desc.enable_reg = res->start;
+ 		drvdata[data_idx].desc.enable_reg = offset;
  		drvdata[data_idx].desc.enable_mask = info->enable_mask;
  		drvdata[data_idx].desc.enable_val = info->enable;
 +		drvdata[data_idx].desc.disable_val = info->disable_val;
  
  		cfg.init_data = pbias_matches[idx].init_data;
  		cfg.driver_data = &drvdata[data_idx];