diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-01-19 15:05:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-20 08:16:01 +0100 |
| commit | a019f5e8c522f5b5f8b3419a1e56d142ea4c7621 (patch) | |
| tree | df38d756f18400c0af6518d8e40449ff93774b93 /sound | |
| parent | ALSA: line6: Drop usb_device sysfs symlink (diff) | |
| download | linux-dev-a019f5e8c522f5b5f8b3419a1e56d142ea4c7621.tar.xz linux-dev-a019f5e8c522f5b5f8b3419a1e56d142ea4c7621.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/line6/capture.c | 4 | ||||
| -rw-r--r-- | sound/usb/line6/driver.c | 6 | ||||
| -rw-r--r-- | sound/usb/line6/midi.c | 5 | ||||
| -rw-r--r-- | sound/usb/line6/playback.c | 4 | ||||
| -rw-r--r-- | sound/usb/line6/variax.c | 4 |
5 files changed, 5 insertions, 18 deletions
diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c index 1970ab57cb6f..727b31876d48 100644 --- 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 23d504f4b6bc..b8f5134dcec2 100644 --- 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 ebca5ebcfecc..f333cef5d2d7 100644 --- 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 8fc2dedbeb52..5a7fe409a3b9 100644 --- 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 0c852bb1e76c..9a9c7e48e24f 100644 --- 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); |