evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Kernel already shows the error in the common path.

Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-19 15:05:10 +01:00
parent 45a82f1891
commit a019f5e8c5
5 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/usb/line6/capture.c
View file

@ -402,10 +402,8 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm)
urb = line6pcm->urb_audio_in[i] = urb = line6pcm->urb_audio_in[i] =
usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL); usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL);
if (urb == NULL) { if (urb == NULL)
dev_err(line6->ifcdev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
}
urb->dev = line6->usbdev; urb->dev = line6->usbdev;
urb->pipe = urb->pipe =

6
sound/usb/line6/driver.c
View file

@ -190,7 +190,6 @@ int line6_send_raw_message_async(struct usb_line6 *line6, const char *buffer,
if (urb == NULL) { if (urb == NULL) {
kfree(msg); kfree(msg);
dev_err(line6->ifcdev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
@ -215,10 +214,8 @@ int line6_version_request_async(struct usb_line6 *line6)
buffer = kmemdup(line6_request_version, buffer = kmemdup(line6_request_version,
sizeof(line6_request_version), GFP_ATOMIC); sizeof(line6_request_version), GFP_ATOMIC);
if (buffer == NULL) { if (buffer == NULL)
dev_err(line6->ifcdev, "Out of memory");
return -ENOMEM; return -ENOMEM;
}
retval = line6_send_raw_message_async(line6, buffer, retval = line6_send_raw_message_async(line6, buffer,
sizeof(line6_request_version)); sizeof(line6_request_version));
@ -593,7 +590,6 @@ int line6_probe(struct usb_interface *interface,
line6->urb_listen = usb_alloc_urb(0, GFP_KERNEL); line6->urb_listen = usb_alloc_urb(0, GFP_KERNEL);
if (line6->urb_listen == NULL) { if (line6->urb_listen == NULL) {
dev_err(&interface->dev, "Out of memory\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_destruct; goto err_destruct;
} }

5
sound/usb/line6/midi.c
View file

@ -121,16 +121,13 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
urb = usb_alloc_urb(0, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC);
if (urb == NULL) { if (urb == NULL)
dev_err(line6->ifcdev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
}
transfer_buffer = kmemdup(data, length, GFP_ATOMIC); transfer_buffer = kmemdup(data, length, GFP_ATOMIC);
if (transfer_buffer == NULL) { if (transfer_buffer == NULL) {
usb_free_urb(urb); usb_free_urb(urb);
dev_err(line6->ifcdev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
} }

4
sound/usb/line6/playback.c
View file

@ -558,10 +558,8 @@ int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm)
urb = line6pcm->urb_audio_out[i] = urb = line6pcm->urb_audio_out[i] =
usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL); usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL);
if (urb == NULL) { if (urb == NULL)
dev_err(line6->ifcdev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
}
urb->dev = line6->usbdev; urb->dev = line6->usbdev;
urb->pipe = urb->pipe =

4
sound/usb/line6/variax.c
View file

@ -260,10 +260,8 @@ static int variax_try_init(struct usb_interface *interface,
variax->buffer_activate = kmemdup(variax_activate, variax->buffer_activate = kmemdup(variax_activate,
sizeof(variax_activate), GFP_KERNEL); sizeof(variax_activate), GFP_KERNEL);
if (variax->buffer_activate == NULL) { if (variax->buffer_activate == NULL)
dev_err(&interface->dev, "Out of memory\n");
return -ENOMEM; return -ENOMEM;
}
/* initialize audio system: */ /* initialize audio system: */
err = line6_init_audio(&variax->line6); err = line6_init_audio(&variax->line6);