---

yaml --- r: 344564 b: refs/heads/master c: a240af2 h: refs/heads/master v: v3
git-mirror · Dec 10, 2012 · 903d2c5 · 903d2c5
1 parent a0c4748
commit 903d2c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2ed00da5047806233e288b991d9be997a5eb214
+refs/heads/master: a240af2eb24679f4d27d87281b25faee0a25df1a
diff --git a/trunk/drivers/video/console/softcursor.c b/trunk/drivers/video/console/softcursor.c
@@ -35,8 +35,7 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
 	dsize = s_pitch * cursor->image.height;
 
 	if (dsize + sizeof(struct fb_image) != ops->cursor_size) {
-		if (ops->cursor_src != NULL)
-			kfree(ops->cursor_src);
+		kfree(ops->cursor_src);
 		ops->cursor_size = dsize + sizeof(struct fb_image);
 
 		ops->cursor_src = kmalloc(ops->cursor_size, GFP_ATOMIC);