summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/core.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-07 15:44:30 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-18 16:15:03 +0300
commit47eb6763ff63126e34785be0ea5f365180595024 (patch)
tree011f05a72dfe3ab10e1a2b566f5cf3562cf0f6a1 /drivers/video/omap2/dss/core.c
parentbcb226a9254d30c0c44bc724c22b7a5d3fadec6a (diff)
downloadop-kernel-dev-47eb6763ff63126e34785be0ea5f365180595024.zip
op-kernel-dev-47eb6763ff63126e34785be0ea5f365180595024.tar.gz
OMAPDSS: handle errors in dss_init_device
Add error handling to dss_init_device(), which has, for some reason, been missing. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/core.c')
-rw-r--r--drivers/video/omap2/dss/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 315f557..9315ece 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -358,7 +358,9 @@ static int dss_driver_probe(struct device *dev)
dev_name(dev), dssdev->driver_name,
dssdrv->driver.name);
- dss_init_device(core.pdev, dssdev);
+ r = dss_init_device(core.pdev, dssdev);
+ if (r)
+ return r;
force = core.default_display_name &&
strcmp(core.default_display_name, dssdev->name) == 0;
OpenPOWER on IntegriCloud