aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorYong Wang <yong.y.wang@linux.intel.com>2010-03-20 02:02:16 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-20 02:03:09 -0400
commit88fcf710c13bd41f2b98c5411e4f21ab98da4fb4 (patch)
tree70302e38f10076fb6844090366cfe270b622a9e0 /drivers/input
parent31968ecf584330b51a25b7bf881c2b632a02a3fb (diff)
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/input')
-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 e6bde55e5203..f64e004935a9 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,
163 return 0; 163 return 0;
164 164
165 err_out: 165 err_out:
166 kfree(keymap); 166 kfree(map);
167 return error; 167 return error;
168 168
169} 169}