Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / net / can / usb / usb_8dev.c

diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c
index a731720f1d132501d12d6241ccee833ae2e61787..108a30e1509756fe571bb1d6fb6edbdf5dde25d7 100644 (file)
--- a/drivers/net/can/usb/usb_8dev.c
+++ b/drivers/net/can/usb/usb_8dev.c
@@ -623,10 +623,8 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb,
 
        /* create a URB, and a buffer for it, and copy the data to the URB */
        urb = usb_alloc_urb(0, GFP_ATOMIC);
-       if (!urb) {
-               netdev_err(netdev, "No memory left for URBs\n");
+       if (!urb)
                goto nomem;
-       }
 
        buf = usb_alloc_coherent(priv->udev, size, GFP_ATOMIC,
                                 &urb->transfer_dma);
@@ -748,7 +746,6 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)
                /* create a URB, and a buffer for it */
                urb = usb_alloc_urb(0, GFP_KERNEL);
                if (!urb) {
-                       netdev_err(netdev, "No memory left for URBs\n");
                        err = -ENOMEM;
                        break;
                }