Commit 6fd9ff7b authored by Markus Elfring's avatar Markus Elfring Committed by Takashi Iwai
Browse files

ALSA: usx2y: 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 841c1ea0

sound/usb/usx2y/usbusx2yaudio.c

+3 −6
Original line number Diff line number Diff line
@@ -419,11 +419,9 @@ static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs) 


	if (is_playback && NULL == subs->tmpbuf) {	/* allocate a temporary buffer for playback */

		subs->tmpbuf = kcalloc(nr_of_packs(), subs->maxpacksize, GFP_KERNEL);

		if (NULL == subs->tmpbuf) {

			snd_printk(KERN_ERR "cannot malloc tmpbuf\n");

		if (!subs->tmpbuf)

			return -ENOMEM;

	}

	}

	/* allocate and initialize data urbs */

	for (i = 0; i < NRURBS; i++) {

		struct urb **purb = subs->urb + i;
@@ -949,10 +947,9 @@ static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint, 
	for (i = playback_endpoint ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE;

	     i <= SNDRV_PCM_STREAM_CAPTURE; ++i) {

		usX2Y_substream[i] = kzalloc(sizeof(struct snd_usX2Y_substream), GFP_KERNEL);

		if (NULL == usX2Y_substream[i]) {

			snd_printk(KERN_ERR "cannot malloc\n");

		if (!usX2Y_substream[i])

			return -ENOMEM;

		}



		usX2Y_substream[i]->usX2Y = usX2Y(card);

	}