summaryrefslogtreecommitdiff
path: root/drivers/video/mcde
diff options
context:
space:
mode:
authorPer Persson <per.xb.persson@stericsson.com>2011-09-02 14:58:15 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 16:07:34 +0200
commit2e42d50dad0906844cae7cc6234b0593ed4605b1 (patch)
tree33a7756982f52992011c10139eb8b8c44e6ad337 /drivers/video/mcde
parent5835e6c6ebe01713ada50827f04f9febd786c946 (diff)
video: mcde: Fix probe of sub display
Allowed max level for v-display regulator is changed. Error handling if failed to set voltage is changed. Sub display now probes without errors. ST-Ericsson ID: 359672 ST-Ericsson Linux next: Not tested, ER 282779 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Id4ff5df39f7b06d964e4dc9534c5f1ea38a28544 Signed-off-by: Per Persson <per.xb.persson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30053 Reviewed-by: Anders BAUER <anders.bauer@stericsson.com> Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QABUILD
Diffstat (limited to 'drivers/video/mcde')
-rw-r--r--drivers/video/mcde/display-generic_dsi.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/video/mcde/display-generic_dsi.c b/drivers/video/mcde/display-generic_dsi.c
index 6af7fb77fcd..5e3b38ccba1 100644
--- a/drivers/video/mcde/display-generic_dsi.c
+++ b/drivers/video/mcde/display-generic_dsi.c
@@ -174,13 +174,18 @@ static int __devinit generic_probe(struct mcde_display_device *dev)
pdata->regulator = NULL;
goto regulator_get_failed;
}
- ret = regulator_set_voltage(pdata->regulator,
+
+ if (regulator_set_voltage(pdata->regulator,
pdata->min_supply_voltage,
- pdata->max_supply_voltage);
- if (ret < 0) {
+ pdata->max_supply_voltage) < 0) {
+ int volt;
+
dev_warn(&dev->dev,
- "%s:Failed to set regulator '%s'\n",
+ "%s:Failed to set voltage '%s'\n",
__func__, pdata->regulator_id);
+ volt = regulator_get_voltage(pdata->regulator);
+ dev_warn(&dev->dev,
+ "Voltage:%d\n", volt);
}
/*