[PATCH] fbdev: prevent drivers that have hardware cursors from calling software curso...

[safe/jmp/linux-2.6] / drivers / video / softcursor.c

diff --git a/drivers/video/softcursor.c b/drivers/video/softcursor.c
index 13a4511..229c4bc 100644 (file)
--- a/drivers/video/softcursor.c
+++ b/drivers/video/softcursor.c
@@ -58,17 +58,10 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
        } else 
                memcpy(src, image->data, dsize);
        
-       if (info->pixmap.outbuf)
-               fb_iomove_buf_aligned(info, &info->pixmap, dst, d_pitch, src,
-                                 s_pitch, image->height);
-       else
-               fb_sysmove_buf_aligned(info, &info->pixmap, dst, d_pitch, src,
-                                  s_pitch, image->height);
-
+       fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
        image->data = dst;
        info->fbops->fb_imageblit(info, image);
        kfree(src);
-
        return 0;
 }