diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2017-08-11 18:38:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-12 23:20:55 +0200 |
| commit | 9ecb2406de33470b70b48a2e107730bd37547e31 (patch) | |
| tree | 0423f6f72a8d03112388a700184e2b6910348da3 /sound/usb | |
| parent | ALSA: usx2y: Delete an error message for a failed memory allocation in two fu... (diff) | |
| download | linux-9ecb2406de33470b70b48a2e107730bd37547e31.tar.xz linux-9ecb2406de33470b70b48a2e107730bd37547e31.zip | |
ALSA: usb: Delete an error message for a failed memory allocation in two functions
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/quirks.c | 5 | ||||
| -rw-r--r-- | 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; |