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 1970ab57cb6f31f952b0b5c65350391e48133c39..727b31876d48e5ec2274842a1f809c8f53fc0a11 100644 (file)
--- a/sound/usb/line6/capture.c
+++ b/sound/usb/line6/capture.c
@@ -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 =

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 23d504f4b6bceb8181e05a573b908dbb4fcd9314..b8f5134dcec28adfd4e6b67ef37afa7def440613 100644 (file)
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -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;
                }

diff --git a/sound/usb/line6/midi.c b/sound/usb/line6/midi.c
index ebca5ebcfecc059ae07787ba0478387e1046a08b..f333cef5d2d721ddeb2564d4b6fa3911b9406498 100644 (file)
--- a/sound/usb/line6/midi.c
+++ b/sound/usb/line6/midi.c
@@ -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;
        }
 

diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index 8fc2dedbeb52e7e8a44a42207d43274fa0e3a36a..5a7fe409a3b9ada5ebf1e65eb48117ce4b854caf 100644 (file)
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -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 =

diff --git a/sound/usb/line6/variax.c b/sound/usb/line6/variax.c
index 0c852bb1e76c5c3e2d84fa614accb760dcb9c894..9a9c7e48e24f8f8c8a8e2d20b577980426bcb2ad 100644 (file)
--- a/sound/usb/line6/variax.c
+++ b/sound/usb/line6/variax.c
@@ -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);