rpms/kernel/FC-5 linux-2.6-softcursor-persistent-alloc.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16495

Modified Files:
	linux-2.6-softcursor-persistent-alloc.patch 
Log Message:
update

linux-2.6-softcursor-persistent-alloc.patch:
 softcursor.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

Index: linux-2.6-softcursor-persistent-alloc.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-softcursor-persistent-alloc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-softcursor-persistent-alloc.patch	28 Dec 2005 23:48:23 -0000	1.1
+++ linux-2.6-softcursor-persistent-alloc.patch	2 Aug 2006 21:00:02 -0000	1.2
@@ -7,11 +7,11 @@
 -	u8 *dst, *src;
 +	u8 *dst;
 +	static u8 *src=NULL;
-+	static int allocsize=0;
++	static int allocsize = 0;
  
  	if (info->state != FBINFO_STATE_RUNNING)
  		return 0;
-@@ -31,9 +33,15 @@ int soft_cursor(struct fb_info *info, st
+@@ -31,9 +33,17 @@ int soft_cursor(struct fb_info *info, st
  	s_pitch = (cursor->image.width + 7) >> 3;
  	dsize = s_pitch * cursor->image.height;
  
@@ -24,8 +24,10 @@
 +		allocsize = dsize + sizeof(struct fb_image);
 +
 +		src = kmalloc(allocsize, GFP_ATOMIC);
-+		if (!src)
++		if (!src) {
++			allocsize = 0;
 +			return -ENOMEM;
++		}
 +	}
  
  	image = (struct fb_image *) (src + dsize);