aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJani Nikula <ext-jani.1.nikula@nokia.com>2010-06-01 08:12:12 -0400
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-08-05 09:52:08 -0400
commit9325588757aa7d08bf2ca9c63b669d0d7aa2fc40 (patch)
tree4fc5823cb5cdf06ecd0baeedc99ae4ac6f6f41ed /drivers/video
parentffb63c95b2fa52b02b45537d18f0ca698bef5496 (diff)
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-ioctl.c2
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index d1f56d37405f..994f6a091b49 100644
--- 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)
858 break; 858 break;
859 } 859 }
860 860
861 if (!display->driver->enable_te) { 861 if (!display || !display->driver->enable_te) {
862 r = -ENODEV; 862 r = -ENODEV;
863 break; 863 break;
864 } 864 }
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index a545e8d4817f..db307e3c1dd5 100644
--- 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)
1271 int do_update = 0; 1271 int do_update = 0;
1272 int r = 0; 1272 int r = 0;
1273 1273
1274 if (!display)
1275 return -EINVAL;
1276
1274 omapfb_lock(fbdev); 1277 omapfb_lock(fbdev);
1275 1278
1276 switch (blank) { 1279 switch (blank) {