From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH] Input: matrix-keymap: Delete an error message for a failed memory allocation in matrix_keypad_build_keymap() Date: Thu, 25 Jan 2018 21:12:04 +0100 Message-ID: <78153741-c125-3aa9-59c1-807d842a98e1@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: Received: from mout.web.de ([212.227.15.4]:49268 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751108AbeAYUMH (ORCPT ); Thu, 25 Jan 2018 15:12:07 -0500 Content-Language: en-GB Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: linux-input@vger.kernel.org, Dmitry Torokhov Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Thu, 25 Jan 2018 21:07:00 +0100 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/input/matrix-keymap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c index 8ccefc15c7a4..298bd56b02bd 100644 --- a/drivers/input/matrix-keymap.c +++ b/drivers/input/matrix-keymap.c @@ -173,11 +173,8 @@ int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data, keymap = devm_kzalloc(input_dev->dev.parent, max_keys * sizeof(*keymap), GFP_KERNEL); - if (!keymap) { - dev_err(input_dev->dev.parent, - "Unable to allocate memory for keymap"); + if (!keymap) return -ENOMEM; - } } input_dev->keycode = keymap; -- 2.16.1