aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/omapfb/omapfb-ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-ioctl.c')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-ioctl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 4f68cb0d59de..1ffa760b8545 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -172,7 +172,7 @@ static int omapfb_update_window_nolock(struct fb_info *fbi,
172 if (x + w > dw || y + h > dh) 172 if (x + w > dw || y + h > dh)
173 return -EINVAL; 173 return -EINVAL;
174 174
175 return display->update(display, x, y, w, h); 175 return display->driver->update(display, x, y, w, h);
176} 176}
177 177
178/* This function is exported for SGX driver use */ 178/* This function is exported for SGX driver use */
@@ -496,18 +496,18 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
496 switch (cmd) { 496 switch (cmd) {
497 case OMAPFB_SYNC_GFX: 497 case OMAPFB_SYNC_GFX:
498 DBG("ioctl SYNC_GFX\n"); 498 DBG("ioctl SYNC_GFX\n");
499 if (!display || !display->sync) { 499 if (!display || !display->driver->sync) {
500 /* DSS1 never returns an error here, so we neither */ 500 /* DSS1 never returns an error here, so we neither */
501 /*r = -EINVAL;*/ 501 /*r = -EINVAL;*/
502 break; 502 break;
503 } 503 }
504 504
505 r = display->sync(display); 505 r = display->driver->sync(display);
506 break; 506 break;
507 507
508 case OMAPFB_UPDATE_WINDOW_OLD: 508 case OMAPFB_UPDATE_WINDOW_OLD:
509 DBG("ioctl UPDATE_WINDOW_OLD\n"); 509 DBG("ioctl UPDATE_WINDOW_OLD\n");
510 if (!display || !display->update) { 510 if (!display || !display->driver->update) {
511 r = -EINVAL; 511 r = -EINVAL;
512 break; 512 break;
513 } 513 }
@@ -525,7 +525,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
525 525
526 case OMAPFB_UPDATE_WINDOW: 526 case OMAPFB_UPDATE_WINDOW:
527 DBG("ioctl UPDATE_WINDOW\n"); 527 DBG("ioctl UPDATE_WINDOW\n");
528 if (!display || !display->update) { 528 if (!display || !display->driver->update) {
529 r = -EINVAL; 529 r = -EINVAL;
530 break; 530 break;
531 } 531 }