From 903d2c585b82372da1c8581318bf3595e3ec1919 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 7 Dec 2012 12:30:39 -0800 Subject: [PATCH] --- yaml --- r: 344564 b: refs/heads/master c: a240af2eb24679f4d27d87281b25faee0a25df1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/console/softcursor.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index edb2db8a88af..5db9a958d81e 100644 --- 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 index 25f835bf3d72..46dd8f5d2e9e 100644 --- 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);