These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / vt6656 / usbpipe.c

diff --git a/kernel/drivers/staging/vt6656/usbpipe.c b/kernel/drivers/staging/vt6656/usbpipe.c
index 88bf518..c975c3b 100644 (file)
--- a/kernel/drivers/staging/vt6656/usbpipe.c
+++ b/kernel/drivers/staging/vt6656/usbpipe.c
@@ -141,7 +141,7 @@ int vnt_start_interrupt_urb(struct vnt_private *priv)
 {
        int status = STATUS_FAILURE;
 
-       if (priv->int_buf.in_use == true)
+       if (priv->int_buf.in_use)
                return STATUS_FAILURE;
 
        priv->int_buf.in_use = true;
@@ -168,7 +168,6 @@ static void vnt_submit_rx_urb_complete(struct urb *urb)
 {
        struct vnt_rcb *rcb = urb->context;
        struct vnt_private *priv = rcb->priv;
-       unsigned long flags;
 
        switch (urb->status) {
        case 0:
@@ -184,8 +183,6 @@ static void vnt_submit_rx_urb_complete(struct urb *urb)
        }
 
        if (urb->actual_length) {
-               spin_lock_irqsave(&priv->lock, flags);
-
                if (vnt_rx_data(priv, rcb, urb->actual_length)) {
                        rcb->skb = dev_alloc_skb(priv->rx_buf_sz);
                        if (!rcb->skb) {
@@ -193,7 +190,6 @@ static void vnt_submit_rx_urb_complete(struct urb *urb)
                                        "Failed to re-alloc rx skb\n");
 
                                rcb->in_use = false;
-                               spin_unlock_irqrestore(&priv->lock, flags);
                                return;
                        }
                } else {
@@ -203,8 +199,6 @@ static void vnt_submit_rx_urb_complete(struct urb *urb)
 
                urb->transfer_buffer = skb_put(rcb->skb,
                                                skb_tailroom(rcb->skb));
-
-               spin_unlock_irqrestore(&priv->lock, flags);
        }
 
        if (usb_submit_urb(urb, GFP_ATOMIC)) {