Commit d1d4120f authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: lock changes: vRunCommand remove locks. 



Removing atomic locked paths to usbpipe.c PIPEnsControlOut and PIPEnsControlIn

This function will nolonger need any locking.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7af94000

drivers/staging/vt6656/wcmd.c

+2 −11
Original line number Diff line number Diff line
@@ -286,8 +286,6 @@ void vRunCommand(struct work_struct *work) 
	if (pDevice->bCmdRunning != true)

		return;



	spin_lock_irq(&pDevice->lock);



	switch (pDevice->eCommandState) {



	case WLAN_CMD_SCAN_START:
@@ -365,11 +363,9 @@ void vRunCommand(struct work_struct *work) 
			if ((pMgmt->b11hEnable == false) ||

			    (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {

				s_vProbeChannel(pDevice);

				spin_unlock_irq(&pDevice->lock);

				vCommandTimerWait((void *) pDevice, 100);

				return;

			} else {

				spin_unlock_irq(&pDevice->lock);

				vCommandTimerWait((void *) pDevice, WCMD_PASSIVE_SCAN_TIME);

				return;

			}
@@ -504,7 +500,6 @@ void vRunCommand(struct work_struct *work) 
				pDevice->byLinkWaitCount = 0;

				pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT;

				vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT);

				spin_unlock_irq(&pDevice->lock);

				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n");

				return;

			}
@@ -578,7 +573,6 @@ void vRunCommand(struct work_struct *work) 
				pDevice->byLinkWaitCount = 0;

				pDevice->eCommandState = WLAN_ASSOCIATE_WAIT;

				vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT);

				spin_unlock_irq(&pDevice->lock);

				return;

			}

		} else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) {
@@ -587,7 +581,6 @@ void vRunCommand(struct work_struct *work) 
			//mike add:wait another 2 sec if authenticated_frame delay!

			pDevice->byLinkWaitCount++;

			printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);

			spin_unlock_irq(&pDevice->lock);

			vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT/2);

			return;

		}
@@ -622,7 +615,6 @@ void vRunCommand(struct work_struct *work) 
			//mike add:wait another 2 sec if associated_frame delay!

			pDevice->byLinkWaitCount++;

			printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);

			spin_unlock_irq(&pDevice->lock);

			vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT/2);

			return;

		}
@@ -752,9 +744,9 @@ void vRunCommand(struct work_struct *work) 


				pDevice->byKeyIndex = 0;

				pDevice->bTransmitKey = false;

				spin_unlock_irq(&pDevice->lock);



				KeyvInitTable(pDevice, &pDevice->sKey);

				spin_lock_irq(&pDevice->lock);



				pMgmt->byCSSPK = KEY_CTL_NONE;

				pMgmt->byCSSGK = KEY_CTL_NONE;
@@ -882,7 +874,6 @@ void vRunCommand(struct work_struct *work) 


	s_bCommandComplete(pDevice);



	spin_unlock_irq(&pDevice->lock);

	return;

}