Merge branch 'gup_flag-cleanups'

[cascardo/linux.git] / drivers / video / fbdev / omap2 / omapfb / dss / dsi.c

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index 9e4800a..30d49f3 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -1167,7 +1167,6 @@ static int dsi_regulator_init(struct platform_device *dsidev)
 {
        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
        struct regulator *vdds_dsi;
-       int r;
 
        if (dsi->vdds_dsi_reg != NULL)
                return 0;
@@ -1180,13 +1179,6 @@ static int dsi_regulator_init(struct platform_device *dsidev)
                return PTR_ERR(vdds_dsi);
        }
 
-       r = regulator_set_voltage(vdds_dsi, 1800000, 1800000);
-       if (r) {
-               devm_regulator_put(vdds_dsi);
-               DSSERR("can't set the DSI regulator voltage\n");
-               return r;
-       }
-
        dsi->vdds_dsi_reg = vdds_dsi;
 
        return 0;
@@ -5348,7 +5340,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
 
        dsi->phy_base = devm_ioremap(&dsidev->dev, res->start,
                resource_size(res));
-       if (!dsi->proto_base) {
+       if (!dsi->phy_base) {
                DSSERR("can't ioremap DSI PHY\n");
                return -ENOMEM;
        }
@@ -5368,7 +5360,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
 
        dsi->pll_base = devm_ioremap(&dsidev->dev, res->start,
                resource_size(res));
-       if (!dsi->proto_base) {
+       if (!dsi->pll_base) {
                DSSERR("can't ioremap DSI PLL\n");
                return -ENOMEM;
        }