From 374e837069bb5570266dcb41607dc983269702d7 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 6 Jun 2013 10:48:30 -0400
Subject: [PATCH] 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>
---
drivers/input/key_matrix.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c
index ea05c77ac7d..c900e45d150 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;
}
--
GitLab