summaryrefslogtreecommitdiff
path: root/drivers/video/omap2/dss/dpi.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-06-23 16:38:21 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-09-14 18:08:23 +0300
commit05e1d6060743e34e3a9db65346168dc688f9223e (patch)
tree2c8ca4e0820392647fe03137be62b91f08def0ac /drivers/video/omap2/dss/dpi.c
parent79e4424fbe83a4f2170f3cfa4628d5a34c520d37 (diff)
downloadlwn-05e1d6060743e34e3a9db65346168dc688f9223e.tar.gz
lwn-05e1d6060743e34e3a9db65346168dc688f9223e.zip
OMAP: DSS2: check for manager when enabling display
None of the DSS interface drivers check if an overlay manager is connected to the display when the display is being enabled. This leads to null pointer crash if the display has no manager. This patch checks for the manager and returns an error if it is null. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
-rw-r--r--drivers/video/omap2/dss/dpi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index f053b180ecd7..046ce0806e14 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -176,6 +176,11 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
{
int r;
+ if (dssdev->manager == NULL) {
+ DSSERR("failed to enable display: no manager\n");
+ return -ENODEV;
+ }
+
r = omap_dss_start_device(dssdev);
if (r) {
DSSERR("failed to start device\n");