Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux

[karo-tx-linux.git] / drivers / video / omap2 / omapfb / omapfb-ioctl.c

diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 442cff4dea78e14cef448c6f3c6812c57a2311f8..8b1e9e375f02ef42d54dc775ff69bece1709bad0 100644 (file)
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -787,7 +787,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
 
        case OMAPFB_WAITFORVSYNC:
                DBG("ioctl WAITFORVSYNC\n");
-               if (!display && !display->output && !display->output->manager) {
+               if (!display || !display->output || !display->output->manager) {
                        r = -EINVAL;
                        break;
                }