Merge tag 'pinctrl-v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-block.git] / drivers / net / can / usb / kvaser_usb.c

diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 6f1f3b675ff553a96d4342b619e34a606fa9be29..d51e0c401b483cbef83caabdf5b92064e5b98b84 100644 (file)
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -787,10 +787,8 @@ static int kvaser_usb_simple_msg_async(struct kvaser_usb_net_priv *priv,
        int err;
 
        urb = usb_alloc_urb(0, GFP_ATOMIC);
-       if (!urb) {
-               netdev_err(netdev, "No memory left for URBs\n");
+       if (!urb)
                return -ENOMEM;
-       }
 
        buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC);
        if (!buf) {
@@ -1393,8 +1391,6 @@ static int kvaser_usb_setup_rx_urbs(struct kvaser_usb *dev)
 
                urb = usb_alloc_urb(0, GFP_KERNEL);
                if (!urb) {
-                       dev_warn(dev->udev->dev.parent,
-                                "No memory left for URBs\n");
                        err = -ENOMEM;
                        break;
                }
@@ -1670,7 +1666,6 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,
 
        urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (!urb) {
-               netdev_err(netdev, "No memory left for URBs\n");
                stats->tx_dropped++;
                dev_kfree_skb(skb);
                return NETDEV_TX_OK;