staging: vt6656: lock changes: vRunCommand nsDMA_tx_packet
authorMalcolm Priestley <tvboxspy@gmail.com>
Thu, 15 May 2014 21:49:18 +0000 (22:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 May 2014 22:02:19 +0000 (15:02 -0700)
vRunCommand is nolonger atomic add lock for nsDMA_tx_packet.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/wcmd.c

index d51cc90..66d59d5 100644 (file)
@@ -279,6 +279,7 @@ void vRunCommand(struct work_struct *work)
        int ii;
        u8 byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
        u8 byData;
+       unsigned long flags;
 
        if (pDevice->Flags & fMP_DISCONNECTED)
                return;
@@ -667,9 +668,13 @@ void vRunCommand(struct work_struct *work)
                                        pDevice->bMoreData = true;
                                }
 
+                               spin_lock_irqsave(&pDevice->lock, flags);
+
                                if (nsDMA_tx_packet(pDevice, skb) != 0)
                                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail\n");
 
+                               spin_unlock_irqrestore(&pDevice->lock, flags);
+
                                pMgmt->sNodeDBTable[0].wEnQueueCnt--;
                        }
                }
@@ -690,9 +695,13 @@ void vRunCommand(struct work_struct *work)
                                                pDevice->bMoreData = true;
                                        }
 
+                                       spin_lock_irqsave(&pDevice->lock, flags);
+
                                        if (nsDMA_tx_packet(pDevice, skb) != 0)
                                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail\n");
 
+                                       spin_unlock_irqrestore(&pDevice->lock, flags);
+
                                        pMgmt->sNodeDBTable[ii].wEnQueueCnt--;
                                        // check if sta ps enable, wait next pspoll
                                        // if sta ps disable, send all pending buffers.