aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYong Wang <yong.y.wang@linux.intel.com>2010-03-19 23:02:16 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-19 23:03:09 -0700
commit88fcf710c13bd41f2b98c5411e4f21ab98da4fb4 (patch)
tree70302e38f10076fb6844090366cfe270b622a9e0 /drivers
parent31968ecf584330b51a25b7bf881c2b632a02a3fb (diff)
downloadmrst-s0i3-test-88fcf710c13bd41f2b98c5411e4f21ab98da4fb4.tar.gz
mrst-s0i3-test-88fcf710c13bd41f2b98c5411e4f21ab98da4fb4.tar.xz
mrst-s0i3-test-88fcf710c13bd41f2b98c5411e4f21ab98da4fb4.zip
Input: sparse-keymap - free the right keymap on error
'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> Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/sparse-keymap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c
index e6bde55e520..f64e004935a 100644
--- a/drivers/input/sparse-keymap.c
+++ b/drivers/input/sparse-keymap.c
@@ -163,7 +163,7 @@ int sparse_keymap_setup(struct input_dev *dev,
return 0;
err_out:
- kfree(keymap);
+ kfree(map);
return error;
}