Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a019f5e8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: line6: Remove superfluous out-of-memory error messages 



Kernel already shows the error in the common path.

Tested-by: default avatarChris Rorvick <chris@rorvick.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 45a82f18

sound/usb/line6/capture.c

+1 −3
Original line number Diff line number Diff line
@@ -402,10 +402,8 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm) 
		urb = line6pcm->urb_audio_in[i] =

		    usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL);



		if (urb == NULL) {

			dev_err(line6->ifcdev, "Out of memory\n");

		if (urb == NULL)

			return -ENOMEM;

		}



		urb->dev = line6->usbdev;

		urb->pipe =

sound/usb/line6/driver.c

+1 −5
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ int line6_send_raw_message_async(struct usb_line6 *line6, const char *buffer, 


	if (urb == NULL) {

		kfree(msg);

		dev_err(line6->ifcdev, "Out of memory\n");

		return -ENOMEM;

	}
@@ -215,10 +214,8 @@ int line6_version_request_async(struct usb_line6 *line6) 


	buffer = kmemdup(line6_request_version,

			sizeof(line6_request_version), GFP_ATOMIC);

	if (buffer == NULL) {

		dev_err(line6->ifcdev, "Out of memory");

	if (buffer == NULL)

		return -ENOMEM;

	}



	retval = line6_send_raw_message_async(line6, buffer,

					      sizeof(line6_request_version));
@@ -593,7 +590,6 @@ int line6_probe(struct usb_interface *interface, 
		line6->urb_listen = usb_alloc_urb(0, GFP_KERNEL);



		if (line6->urb_listen == NULL) {

			dev_err(&interface->dev, "Out of memory\n");

			ret = -ENOMEM;

			goto err_destruct;

		}

sound/usb/line6/midi.c

+1 −4
Original line number Diff line number Diff line
@@ -121,16 +121,13 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data, 


	urb = usb_alloc_urb(0, GFP_ATOMIC);



	if (urb == NULL) {

		dev_err(line6->ifcdev, "Out of memory\n");

	if (urb == NULL)

		return -ENOMEM;

	}



	transfer_buffer = kmemdup(data, length, GFP_ATOMIC);



	if (transfer_buffer == NULL) {

		usb_free_urb(urb);

		dev_err(line6->ifcdev, "Out of memory\n");

		return -ENOMEM;

	}

sound/usb/line6/playback.c

+1 −3
Original line number Diff line number Diff line
@@ -558,10 +558,8 @@ int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm) 
		urb = line6pcm->urb_audio_out[i] =

		    usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL);



		if (urb == NULL) {

			dev_err(line6->ifcdev, "Out of memory\n");

		if (urb == NULL)

			return -ENOMEM;

		}



		urb->dev = line6->usbdev;

		urb->pipe =

sound/usb/line6/variax.c

+1 −3
Original line number Diff line number Diff line
@@ -260,10 +260,8 @@ static int variax_try_init(struct usb_interface *interface, 
	variax->buffer_activate = kmemdup(variax_activate,

					  sizeof(variax_activate), GFP_KERNEL);



	if (variax->buffer_activate == NULL) {

		dev_err(&interface->dev, "Out of memory\n");

	if (variax->buffer_activate == NULL)

		return -ENOMEM;

	}



	/* initialize audio system: */

	err = line6_init_audio(&variax->line6);