linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / video / console / softcursor.c

diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
index 2ade752..3957fc7 100644 (file)
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -25,9 +25,7 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
        unsigned int buf_align = info->pixmap.buf_align - 1;
        unsigned int i, size, dsize, s_pitch, d_pitch;
        struct fb_image *image;
-       u8 *dst;
-       static u8 *src=NULL;
-       static int allocsize = 0;
+       u8 *dst, *src;
 
        if (info->state != FBINFO_STATE_RUNNING)
                return 0;
@@ -35,17 +33,9 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
        s_pitch = (cursor->image.width + 7) >> 3;
        dsize = s_pitch * cursor->image.height;
 
-       if (dsize + sizeof(struct fb_image) != allocsize) {
-               if (src != NULL)
-                       kfree(src);
-               allocsize = dsize + sizeof(struct fb_image);
-
-               src = kmalloc(allocsize, GFP_ATOMIC);
-               if (!src) {
-                       allocsize = 0;
-                       return -ENOMEM;
-               }
-       }
+       src = kmalloc(dsize + sizeof(struct fb_image), GFP_ATOMIC);
+       if (!src)
+               return -ENOMEM;
 
        image = (struct fb_image *) (src + dsize);
        *image = cursor->image;
@@ -73,6 +63,7 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
        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;
 }