summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2006-01-10 05:53:18 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 17:01:47 +0100
commite53f87a02a0d77c519fb93c7aa0912956294050c (patch)
tree91d982c47fcb9795b9c87edb29613253be50bd34
parent[PATCH] vesafb: Trim vesafb_pan_display (diff)
downloadlinux-e53f87a02a0d77c519fb93c7aa0912956294050c.tar.xz
linux-e53f87a02a0d77c519fb93c7aa0912956294050c.zip
[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>
-rw-r--r--drivers/video/vesafb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index e6e56b8df2db..8982e540214c 100644
--- 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;