diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/omap2/dss/dpi.c | 3 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dsi.c | 3 | ||||
-rw-r--r-- | drivers/video/omap2/dss/hdmi4.c | 3 | ||||
-rw-r--r-- | drivers/video/omap2/dss/sdi.c | 3 | ||||
-rw-r--r-- | drivers/video/omap2/dss/venc.c | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index bd48cde53561..fcba3c129efb 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c | |||
@@ -551,7 +551,8 @@ static int dpi_init_regulator(void) | |||
551 | 551 | ||
552 | vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "vdds_dsi"); | 552 | vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "vdds_dsi"); |
553 | if (IS_ERR(vdds_dsi)) { | 553 | if (IS_ERR(vdds_dsi)) { |
554 | DSSERR("can't get VDDS_DSI regulator\n"); | 554 | if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER) |
555 | DSSERR("can't get VDDS_DSI regulator\n"); | ||
555 | return PTR_ERR(vdds_dsi); | 556 | return PTR_ERR(vdds_dsi); |
556 | } | 557 | } |
557 | 558 | ||
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index f6f8d93c4be9..a820c37e323e 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c | |||
@@ -1158,7 +1158,8 @@ static int dsi_regulator_init(struct platform_device *dsidev) | |||
1158 | vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "VCXIO"); | 1158 | vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "VCXIO"); |
1159 | 1159 | ||
1160 | if (IS_ERR(vdds_dsi)) { | 1160 | if (IS_ERR(vdds_dsi)) { |
1161 | DSSERR("can't get VDDS_DSI regulator\n"); | 1161 | if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER) |
1162 | DSSERR("can't get VDDS_DSI regulator\n"); | ||
1162 | return PTR_ERR(vdds_dsi); | 1163 | return PTR_ERR(vdds_dsi); |
1163 | } | 1164 | } |
1164 | 1165 | ||
diff --git a/drivers/video/omap2/dss/hdmi4.c b/drivers/video/omap2/dss/hdmi4.c index c7fbe4d36041..4a74538f9ea5 100644 --- a/drivers/video/omap2/dss/hdmi4.c +++ b/drivers/video/omap2/dss/hdmi4.c | |||
@@ -95,7 +95,8 @@ static int hdmi_init_regulator(void) | |||
95 | reg = devm_regulator_get(&hdmi.pdev->dev, "VDAC"); | 95 | reg = devm_regulator_get(&hdmi.pdev->dev, "VDAC"); |
96 | 96 | ||
97 | if (IS_ERR(reg)) { | 97 | if (IS_ERR(reg)) { |
98 | DSSERR("can't get VDDA_HDMI_DAC regulator\n"); | 98 | if (PTR_ERR(reg) != -EPROBE_DEFER) |
99 | DSSERR("can't get VDDA_HDMI_DAC regulator\n"); | ||
99 | return PTR_ERR(reg); | 100 | return PTR_ERR(reg); |
100 | } | 101 | } |
101 | 102 | ||
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c index ccc569ae7cca..156d146a72a6 100644 --- a/drivers/video/omap2/dss/sdi.c +++ b/drivers/video/omap2/dss/sdi.c | |||
@@ -265,7 +265,8 @@ static int sdi_init_regulator(void) | |||
265 | 265 | ||
266 | vdds_sdi = devm_regulator_get(&sdi.pdev->dev, "vdds_sdi"); | 266 | vdds_sdi = devm_regulator_get(&sdi.pdev->dev, "vdds_sdi"); |
267 | if (IS_ERR(vdds_sdi)) { | 267 | if (IS_ERR(vdds_sdi)) { |
268 | DSSERR("can't get VDDS_SDI regulator\n"); | 268 | if (PTR_ERR(vdds_sdi) != -EPROBE_DEFER) |
269 | DSSERR("can't get VDDS_SDI regulator\n"); | ||
269 | return PTR_ERR(vdds_sdi); | 270 | return PTR_ERR(vdds_sdi); |
270 | } | 271 | } |
271 | 272 | ||
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 5f88ac47b7fa..2cd7f7e42105 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c | |||
@@ -639,7 +639,8 @@ static int venc_init_regulator(void) | |||
639 | vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda_dac"); | 639 | vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda_dac"); |
640 | 640 | ||
641 | if (IS_ERR(vdda_dac)) { | 641 | if (IS_ERR(vdda_dac)) { |
642 | DSSERR("can't get VDDA_DAC regulator\n"); | 642 | if (PTR_ERR(vdda_dac) != -EPROBE_DEFER) |
643 | DSSERR("can't get VDDA_DAC regulator\n"); | ||
643 | return PTR_ERR(vdda_dac); | 644 | return PTR_ERR(vdda_dac); |
644 | } | 645 | } |
645 | 646 | ||