Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / vt6656 / main_usb.c

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index ac4fecb30d0e9c1a38421cf4c67ffba8fa4af35b..0594828bdabf92feca8736a7b777c5d6b7b07763 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -440,10 +440,8 @@ static bool vnt_alloc_bufs(struct vnt_private *priv)
 
                /* allocate URBs */
                tx_context->urb = usb_alloc_urb(0, GFP_KERNEL);
-               if (!tx_context->urb) {
-                       dev_err(&priv->usb->dev, "alloc tx urb failed\n");
+               if (!tx_context->urb)
                        goto free_tx;
-               }
 
                tx_context->in_use = false;
        }
@@ -462,10 +460,8 @@ static bool vnt_alloc_bufs(struct vnt_private *priv)
 
                /* allocate URBs */
                rcb->urb = usb_alloc_urb(0, GFP_KERNEL);
-               if (!rcb->urb) {
-                       dev_err(&priv->usb->dev, "Failed to alloc rx urb\n");
+               if (!rcb->urb)
                        goto free_rx_tx;
-               }
 
                rcb->skb = dev_alloc_skb(priv->rx_buf_sz);
                if (!rcb->skb)
@@ -479,10 +475,8 @@ static bool vnt_alloc_bufs(struct vnt_private *priv)
        }
 
        priv->interrupt_urb = usb_alloc_urb(0, GFP_KERNEL);
-       if (!priv->interrupt_urb) {
-               dev_err(&priv->usb->dev, "Failed to alloc int urb\n");
+       if (!priv->interrupt_urb)
                goto free_rx_tx;
-       }
 
        priv->int_buf.data_buf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL);
        if (!priv->int_buf.data_buf) {