Commit 9ecb2406 authored by Markus Elfring's avatar Markus Elfring Committed by Takashi Iwai
Browse files

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6fd9ff7b

sound/usb/quirks.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

sound/usb/stream.c

+1 −3
Original line number Diff line number Diff line
@@ -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;