[PATCH] Fix vesafb display panning regression

Fix vesafb hang when scroll mode is REDRAW.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index e6e56b8df2db29a724a06b2ec6b50e5421e5326b..8982e540214c56b2de7d0299ce8c15258d76fc83 100644 (file)
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -417,6 +417,9 @@ static int __init vesafb_probe(struct platform_device *dev)
        info->flags = FBINFO_FLAG_DEFAULT |
                (ypan) ? FBINFO_HWACCEL_YPAN : 0;
 
+       if (!ypan)
+               info->fbops->fb_pan_display = NULL;
+
        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
                err = -ENOMEM;
                goto err;