]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
OMAPDSS: DSSCOMP: Null pointer check for mgr, output
authorHemant Hariyani <hemanthariyani@ti.com>
Wed, 17 Apr 2013 15:47:13 +0000 (10:47 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Fri, 12 Jul 2013 22:41:45 +0000 (17:41 -0500)
Avoids kernel panic when mgr or mgr->output is null.

Change-Id: I1dbe7a1e77fbdfd2c598af27ba7bb68c12bca317
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
drivers/video/omap2/dsscomp/base.c

index 65db6e270a4148306dece10b551c22c39cde14e2..10a3a2fcb3a64c07fd2a8c04849ad70c98cfa195 100755 (executable)
@@ -380,8 +380,12 @@ struct omap_overlay_manager *find_dss_mgr(int display_ix)
 
        for (i = 0; i < omap_dss_get_num_overlay_managers(); i++) {
                mgr = omap_dss_get_overlay_manager(i);
-               if (mgr->output->device && !strcmp(name, dev_name(&mgr->output->device->dev)))
-                       return mgr;
+               if((mgr) && (mgr->output))
+               {
+                       if (mgr->output->device && !strcmp(name,
+                                       dev_name(&mgr->output->device->dev)))
+                               return mgr;
+               }
        }
        return NULL;
 }