OMAP: DSS2: OMAPFB: Check fb2display() return value

Make sure NULL return value of fb2display() is not referenced. Found by
Coverity.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>

diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index d1f56d37405fa58e4ebddf40101ff6c55e2e1435..994f6a091b49dbf2af1f080ee426286367481d91 100644 (file)
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -858,7 +858,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
                        break;
                }
 
-               if (!display->driver->enable_te) {
+               if (!display || !display->driver->enable_te) {
                        r = -ENODEV;
                        break;
                }

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index a545e8d4817fedca04afa2986577ef5ec7b5b9c9..db307e3c1dd5bbd7a7e401ed61762af41e660930 100644 (file)
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1271,6 +1271,9 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
        int do_update = 0;
        int r = 0;
 
+       if (!display)
+               return -EINVAL;
+
        omapfb_lock(fbdev);
 
        switch (blank) {