aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-12-07 15:30:39 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-12-10 04:33:53 -0500
commita240af2eb24679f4d27d87281b25faee0a25df1a (patch)
treeba95df229a1d2e8721be8e63048bb8c57a58f6b9
parenta2ed00da5047806233e288b991d9be997a5eb214 (diff)
drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/console/softcursor.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
index 25f835bf3d72..46dd8f5d2e9e 100644
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -35,8 +35,7 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
35 dsize = s_pitch * cursor->image.height; 35 dsize = s_pitch * cursor->image.height;
36 36
37 if (dsize + sizeof(struct fb_image) != ops->cursor_size) { 37 if (dsize + sizeof(struct fb_image) != ops->cursor_size) {
38 if (ops->cursor_src != NULL) 38 kfree(ops->cursor_src);
39 kfree(ops->cursor_src);
40 ops->cursor_size = dsize + sizeof(struct fb_image); 39 ops->cursor_size = dsize + sizeof(struct fb_image);
41 40
42 ops->cursor_src = kmalloc(ops->cursor_size, GFP_ATOMIC); 41 ops->cursor_src = kmalloc(ops->cursor_size, GFP_ATOMIC);