]> git.karo-electronics.de Git - linux-beck.git/commitdiff
OMAPDSS: DPI: fix crash with dpi_verify_dsi_pll()
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 12 Nov 2012 14:52:11 +0000 (16:52 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 27 Nov 2012 10:27:01 +0000 (12:27 +0200)
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>
drivers/video/omap2/dss/dpi.c

index 1e103b3135b97856dcd771f5b6a6a89a5becbe8c..c109fa68c01d02c472a81b48a1c250cb69be9510 100644 (file)
@@ -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");
        }