From 3e489e245622cf863716d09a8b565014b0b1b985 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Wed, 11 Apr 2012 20:55:18 -0700
Subject: [PATCH] --- yaml --- r: 298975 b: refs/heads/master c:
 0e3d0f3d960bf5b895adcf9ffc79d2077f1411d5 h: refs/heads/master i:   298973:
 cdf9470352544596250a31ed0fe44a685045bbb8   298971:
 58911ff6dce71000761caac3584b788b8a58bb7c   298967:
 4e63ef31e7554a0a0776c25ec5d4714754bb496a   298959:
 4fd3812fe3e983962057ca97a5a9194e16d8a96f   298943:
 169198fa63eb6dc45466018fd347bb01e08aabf2 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/input/misc/da9052_onkey.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f9a29c4133f5..7f9c281fddbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55158c886a0c43765140673d2343d3119d34a25a
+refs/heads/master: 0e3d0f3d960bf5b895adcf9ffc79d2077f1411d5
diff --git a/trunk/drivers/input/misc/da9052_onkey.c b/trunk/drivers/input/misc/da9052_onkey.c
index 34aebb8cd080..3c843cd725fa 100644
--- a/trunk/drivers/input/misc/da9052_onkey.c
+++ b/trunk/drivers/input/misc/da9052_onkey.c
@@ -95,7 +95,8 @@ static int __devinit da9052_onkey_probe(struct platform_device *pdev)
 	input_dev = input_allocate_device();
 	if (!onkey || !input_dev) {
 		dev_err(&pdev->dev, "Failed to allocate memory\n");
-		return -ENOMEM;
+		error = -ENOMEM;
+		goto err_free_mem;
 	}
 
 	onkey->input = input_dev;