From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 6 Jun 2013 14:48:30 +0000 (-0400)
Subject: input: Finish simplifing key_matrix_decode_fdt()
X-Git-Tag: v2013.07-rc1~20
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=374e837069bb5570266dcb41607dc983269702d7;p=u-boot

input: Finish simplifing key_matrix_decode_fdt()

[trini: Applied v1 of the series rather than v2, this commit is the
delta from v1 to v2]

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Rini <trini@ti.com>
---

diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c
index ea05c77ac7..c900e45d15 100644
--- a/drivers/input/key_matrix.c
+++ b/drivers/input/key_matrix.c
@@ -162,8 +162,10 @@ int key_matrix_decode_fdt(struct key_matrix *config, const void *blob, int node)
 
 	prop = fdt_get_property(blob, node, "linux,keymap", &proplen);
 	/* Basic keymap is required */
-	if (!prop)
+	if (!prop) {
+		debug("%s: cannot find keycode-plain map\n", __func__);
 		return -1;
+	}
 
 	plain_keycode = create_keymap(config, (u32 *)prop->data,
 		proplen, KEY_FN, &config->fn_pos);
@@ -180,7 +182,7 @@ int key_matrix_decode_fdt(struct key_matrix *config, const void *blob, int node)
 	config->fn_keycode = create_keymap(config, (u32 *)prop->data,
 		proplen, -1, NULL);
 	/* Conversion error -> fail */
-	if (!config->plain_keycode) {
+	if (!config->fn_keycode) {
 		free(plain_keycode);
 		return -1;
 	}