diff options
| author | Tomi Valkeinen | 2012-11-12 15:52:11 +0100 |
|---|---|---|
| committer | Tomi Valkeinen | 2012-11-27 11:27:01 +0100 |
| commit | 1de8e129f5e77e5eac6dc0a30df403404ddcd2b3 (patch) | |
| tree | 1c50691285cd68796e06368d16e3dceb64163e92 /drivers/video/omap2 | |
| parent | OMAPDSS: remove declarations for non-existing functions (diff) | |
| download | kernel-qcow2-linux-1de8e129f5e77e5eac6dc0a30df403404ddcd2b3.tar.gz kernel-qcow2-linux-1de8e129f5e77e5eac6dc0a30df403404ddcd2b3.tar.xz kernel-qcow2-linux-1de8e129f5e77e5eac6dc0a30df403404ddcd2b3.zip | |
OMAPDSS: DPI: fix crash with dpi_verify_dsi_pll()
If the DSI support has not been compiled in or the SoC doesn't have DSI
hardware, dpi_get_dsidev() returns NULL. This NULL is passed to
dpi_verify_dsi_pll() causing a crash. The bug was added with commit
0e8276ef75f5c7811b038d1d23b2b42c16efc5ac (OMAPDSS: DPI: always use DSI
PLL if available).
Fix this by checking if dsidev is NULL before calling
dpi_verify_dsi_pll().
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
| -rw-r--r-- | drivers/video/omap2/dss/dpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 1e103b3135b9..c109fa68c01d 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -412,7 +412,7 @@ static int __init dpi_init_display(struct omap_dss_device *dssdev) */ dsidev = dpi_get_dsidev(dssdev->channel); - if (dpi_verify_dsi_pll(dsidev)) { + if (dsidev && dpi_verify_dsi_pll(dsidev)) { dsidev = NULL; DSSWARN("DSI PLL not operational\n"); } |