* [PATCH] ALSA: usb: Delete an error message for a failed memory allocation in two functions
@ 2017-08-11 17:04 SF Markus Elfring
2017-08-12 21:21 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: SF Markus Elfring @ 2017-08-11 17:04 UTC (permalink / raw)
To: alsa-devel, Akshay Bhat, Daniel Mack, Dennis Kadioglu,
Jaroslav Kysela, Johan Hovold, Nobutaka Okabe, Takashi Iwai
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 11 Aug 2017 18:38:25 +0200
Omit an extra message for a memory allocation failure in these functions.
This issue was detected by using the Coccinelle software.
Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
sound/usb/quirks.c | 5 ++---
sound/usb/stream.c | 4 +---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index d7b0b0a3a2db..9db40d58b4e2 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -146,10 +146,9 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
unsigned *rate_table = NULL;
fp = kmemdup(quirk->data, sizeof(*fp), GFP_KERNEL);
- if (!fp) {
- usb_audio_err(chip, "cannot memdup\n");
+ if (!fp)
return -ENOMEM;
- }
+
INIT_LIST_HEAD(&fp->list);
if (fp->nr_rates > MAX_NR_RATES) {
kfree(fp);
diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index 8e9548bc1f1a..d1776e5517ff 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -658,10 +658,8 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
continue;
fp = kzalloc(sizeof(*fp), GFP_KERNEL);
- if (! fp) {
- dev_err(&dev->dev, "cannot malloc\n");
+ if (!fp)
return -ENOMEM;
- }
fp->iface = iface_no;
fp->altsetting = altno;
--
2.14.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ALSA: usb: Delete an error message for a failed memory allocation in two functions
2017-08-11 17:04 [PATCH] ALSA: usb: Delete an error message for a failed memory allocation in two functions SF Markus Elfring
@ 2017-08-12 21:21 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2017-08-12 21:21 UTC (permalink / raw)
To: SF Markus Elfring
Cc: alsa-devel, Nobutaka Okabe, Johan Hovold, Jaroslav Kysela,
Dennis Kadioglu, Akshay Bhat, Daniel Mack, kernel-janitors, LKML
On Fri, 11 Aug 2017 19:04:41 +0200,
SF Markus Elfring wrote:
>
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Fri, 11 Aug 2017 18:38:25 +0200
>
> Omit an extra message for a memory allocation failure in these functions.
>
> This issue was detected by using the Coccinelle software.
>
> Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-12 21:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-11 17:04 [PATCH] ALSA: usb: Delete an error message for a failed memory allocation in two functions SF Markus Elfring
2017-08-12 21:21 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).