]> git.hungrycats.org Git - linux/commitdiff
Input: sparse-keymap - free the right keymap on error
authorYong Wang <yong.y.wang@linux.intel.com>
Sat, 20 Mar 2010 06:02:16 +0000 (23:02 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 26 Apr 2010 14:47:54 +0000 (07:47 -0700)
commit 88fcf710c13bd41f2b98c5411e4f21ab98da4fb4 upstream.

'map' is allocated in sparse_keymap_setup() and it it the one that should
be freed on error instead of 'keymap'.

Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/input/sparse-keymap.c

index fbd3987af57f7291ad12488567772f8f404b319f..e8d65b372034b7e98b1cf1c9da6f2aa7ae2fa283 100644 (file)
@@ -161,7 +161,7 @@ int sparse_keymap_setup(struct input_dev *dev,
        return 0;
 
  err_out:
-       kfree(keymap);
+       kfree(map);
        return error;
 
 }