提交 374e8370 编写于 作者: S Stephen Warren 提交者: Tom Rini

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: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NTom Rini <trini@ti.com>
上级 397bfd46
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册