commit 1f4bb066433322f6f189b084ceebdfb4add77292
author Tobias Klauser <tklauser@distanz.ch> Sat Jul 30 12:08:10 2011 -0700
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> Sat Jul 30 12:19:02 2011 -0700
tree 2c3876f2a2f6db9c58137373e22f250bd58337ef
parent 52db9819ac96b0c5a4e075d836cf21dc529cbce4

Input: gpio_keys - return proper error code if memory allocation fails

Return -ENOMEM if kzalloc fails in gpio_keys_get_devtree_pdata().

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

drivers/input/keyboard/gpio_keys.c

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index ce281d1..67df91a 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -483,7 +483,7 @@
 
 	buttons = kzalloc(pdata->nbuttons * (sizeof *buttons), GFP_KERNEL);
 	if (!buttons)
-		return -ENODEV;
+		return -ENOMEM;
 
 	pp = NULL;
 	i = 0;