From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-input@vger.kernel.org,
Christophe Jaillet <christophe.jaillet@wanadoo.fr>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 1/2] Input: omap4-keypad: Delete two error messages for a failed memory allocation in omap4_keypad_probe()
Date: Fri, 26 Jan 2018 14:49:07 +0100 [thread overview]
Message-ID: <e547d1f3-e4d8-b69b-c9b2-0298feb2bef7@users.sourceforge.net> (raw)
In-Reply-To: <3df8e062-2a39-05c9-bf49-c85fd636abff@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 26 Jan 2018 14:24:35 +0100
Omit extra messages for a memory allocation failure in this function.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/input/keyboard/omap4-keypad.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 940d38b08e6b..6fe554e4026e 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -257,10 +257,8 @@ static int omap4_keypad_probe(struct platform_device *pdev)
}
keypad_data = kzalloc(sizeof(struct omap4_keypad), GFP_KERNEL);
- if (!keypad_data) {
- dev_err(&pdev->dev, "keypad_data memory allocation failed\n");
+ if (!keypad_data)
return -ENOMEM;
- }
keypad_data->irq = irq;
@@ -340,7 +338,6 @@ static int omap4_keypad_probe(struct platform_device *pdev)
keypad_data->keymap = kzalloc(max_keys * sizeof(keypad_data->keymap[0]),
GFP_KERNEL);
if (!keypad_data->keymap) {
- dev_err(&pdev->dev, "Not enough memory for keymap\n");
error = -ENOMEM;
goto err_free_input;
}
--
2.16.1
next prev parent reply other threads:[~2018-01-26 13:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-26 13:48 [PATCH 0/2] Input: omap4-keypad: Adjustments for omap4_keypad_probe() SF Markus Elfring
2018-01-26 13:49 ` SF Markus Elfring [this message]
2018-01-26 13:50 ` [PATCH 2/2] Input: omap4-keypad: Improve a size determination in omap4_keypad_probe() SF Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e547d1f3-e4d8-b69b-c9b2-0298feb2bef7@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dmitry.torokhov@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®