From 11b670b3f447559443b02398998f8426dccd6854 Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Mon, 12 Jul 2010 18:48:24 +0400
Subject: [PATCH] --- yaml --- r: 205883 b: refs/heads/master c:
 cb46f472cbb08c44ae47a5bea80207c4e4407ee3 h: refs/heads/master i:   205881:
 3d686b91e2aaedcd680379191c4a559623cdff62   205879:
 c75690bffc19b6d135e8f20c874b7d6acf620ff8 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/panel/panel.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d7cc6cc8d315..bc6f9bc7762c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d85170ed30a533ef6832cf11b38488e562c311c8
+refs/heads/master: cb46f472cbb08c44ae47a5bea80207c4e4407ee3
diff --git a/trunk/drivers/staging/panel/panel.c b/trunk/drivers/staging/panel/panel.c
index 3e07e41eb885..aeca01c05e40 100644
--- a/trunk/drivers/staging/panel/panel.c
+++ b/trunk/drivers/staging/panel/panel.c
@@ -1995,8 +1995,10 @@ static struct logical_input *panel_bind_key(char *name, char *press,
 		return NULL;
 	}
 	if (!input_name2mask(name, &key->mask, &key->value, &scan_mask_i,
-			     &scan_mask_o))
+			     &scan_mask_o)) {
+		kfree(key);
 		return NULL;
+	}
 
 	key->type = INPUT_TYPE_KBD;
 	key->state = INPUT_ST_LOW;