diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-06-23 13:38:21 (GMT) |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-14 15:08:23 (GMT) |
| commit | 05e1d6060743e34e3a9db65346168dc688f9223e (patch) | |
| tree | 2c8ca4e0820392647fe03137be62b91f08def0ac /drivers/video/omap2/dss/hdmi.c | |
| parent | 79e4424fbe83a4f2170f3cfa4628d5a34c520d37 (diff) | |
| download | linux-05e1d6060743e34e3a9db65346168dc688f9223e.tar.xz | |
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/hdmi.c')
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 256f27a..3767323 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -1231,6 +1231,12 @@ int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev) mutex_lock(&hdmi.lock); + if (dssdev->manager == NULL) { + DSSERR("failed to enable display: no manager\n"); + r = -ENODEV; + goto err0; + } + r = omap_dss_start_device(dssdev); if (r) { DSSERR("failed to start device\n"); |