diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-26 10:26:29 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-26 10:26:29 +0200 |
| commit | 474ff6b8a79093aea966b6246d5b8000de124da9 (patch) | |
| tree | c73caeaeef6d800ca8795687294ed2cbd74607db /drivers/video/omap2/omapfb | |
| parent | 9b76c9cdece2b14a23bfddd765f6dac1dd4d0120 (diff) | |
| parent | 8ad9375f8b7c709b89f7de4de413bb2644ba3c24 (diff) | |
Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux
omapdss fixes for 3.7-rc
Conflicts:
drivers/video/omap2/dss/dss.c
Diffstat (limited to 'drivers/video/omap2/omapfb')
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c index 442cff4dea78..8b1e9e375f02 100644 --- 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; } |