ALSA: line6: Remove superfluous out-of-memory error messages
Kernel already shows the error in the common path.
Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
index 1970ab5..727b318 100644
--- a/sound/usb/line6/capture.c
+++ b/sound/usb/line6/capture.c
@@ -402,10 +402,8 @@
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 =
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 23d504f..b8f5134 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -190,7 +190,6 @@
if (urb == NULL) {
kfree(msg);
- dev_err(line6->ifcdev, "Out of memory\n");
return -ENOMEM;
}
@@ -215,10 +214,8 @@
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 @@
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;
}
diff --git a/sound/usb/line6/midi.c b/sound/usb/line6/midi.c
index ebca5eb..f333cef 100644
--- a/sound/usb/line6/midi.c
+++ b/sound/usb/line6/midi.c
@@ -121,16 +121,13 @@
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;
}
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index 8fc2ded..5a7fe40 100644
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -558,10 +558,8 @@
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 =
diff --git a/sound/usb/line6/variax.c b/sound/usb/line6/variax.c
index 0c852bb1..9a9c7e4 100644
--- a/sound/usb/line6/variax.c
+++ b/sound/usb/line6/variax.c
@@ -260,10 +260,8 @@
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);