From 56b4c049273f3d4ad6d5c71a1569d3fbb4028840 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sun, 27 Sep 2015 09:17:44 +0100 Subject: staging: vt6656: remove RX complete locking. The lock in vnt_submit_rx_urb_complete is blocked by TX activity. The lock comes from a time when RX needed to be synchronized with other parts of the driver because the WLAN API was in driver. Since this is now dealt with in mac80211 the lock is unnecessary. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/usbpipe.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/staging/vt6656') diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index a5912dde9b31..c975c3b87093 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -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)) { -- cgit v1.2.3-59-g8ed1b