projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next
[linux-2.6-block.git]
/
drivers
/
video
/
omap2
/
dss
/
dpi.c
diff --git
a/drivers/video/omap2/dss/dpi.c
b/drivers/video/omap2/dss/dpi.c
index ae1c8b9d39ca91aac496457aa22091d318909621..7411f2674e1682d702c5e3b2af38ffcb8794b24c 100644
(file)
--- a/
drivers/video/omap2/dss/dpi.c
+++ b/
drivers/video/omap2/dss/dpi.c
@@
-550,7
+550,8
@@
static int dpi_init_regulator(void)
vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "vdds_dsi");
if (IS_ERR(vdds_dsi)) {
- DSSERR("can't get VDDS_DSI regulator\n");
+ if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
+ DSSERR("can't get VDDS_DSI regulator\n");
return PTR_ERR(vdds_dsi);
}