diff options
| -rw-r--r-- | drivers/staging/winbond/wb35tx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/winbond/wb35tx.c b/drivers/staging/winbond/wb35tx.c index a4074fd9d30b..9a826957fe51 100644 --- a/drivers/staging/winbond/wb35tx.c +++ b/drivers/staging/winbond/wb35tx.c | |||
| @@ -41,7 +41,7 @@ static void Wb35Tx_complete(struct urb * pUrb) | |||
| 41 | pWb35Tx->TxSendIndex++; | 41 | pWb35Tx->TxSendIndex++; |
| 42 | pWb35Tx->TxSendIndex %= MAX_USB_TX_BUFFER_NUMBER; | 42 | pWb35Tx->TxSendIndex %= MAX_USB_TX_BUFFER_NUMBER; |
| 43 | 43 | ||
| 44 | if (pHwData->SurpriseRemove) /* Let WbWlanHalt to handle surprise remove */ | 44 | if (pHwData->SurpriseRemove) /* Let WbWlanHalt handle surprise remove */ |
| 45 | goto error; | 45 | goto error; |
| 46 | 46 | ||
| 47 | if (pWb35Tx->tx_halt) | 47 | if (pWb35Tx->tx_halt) |
| @@ -151,13 +151,13 @@ void Wb35Tx_stop(struct hw_data * pHwData) | |||
| 151 | 151 | ||
| 152 | /* Try to cancel the Trp of EP2 */ | 152 | /* Try to cancel the Trp of EP2 */ |
| 153 | if (pWb35Tx->EP2vm_state == VM_RUNNING) | 153 | if (pWb35Tx->EP2vm_state == VM_RUNNING) |
| 154 | /* Only use unlink, let Wb35Tx_destroy to free them */ | 154 | /* Only use unlink, let Wb35Tx_destroy free them */ |
| 155 | usb_unlink_urb( pWb35Tx->Tx2Urb ); | 155 | usb_unlink_urb( pWb35Tx->Tx2Urb ); |
| 156 | pr_debug("EP2 Tx stop\n"); | 156 | pr_debug("EP2 Tx stop\n"); |
| 157 | 157 | ||
| 158 | /* Try to cancel the Irp of EP4 */ | 158 | /* Try to cancel the Irp of EP4 */ |
| 159 | if (pWb35Tx->EP4vm_state == VM_RUNNING) | 159 | if (pWb35Tx->EP4vm_state == VM_RUNNING) |
| 160 | /* Only use unlink, let Wb35Tx_destroy to free them */ | 160 | /* Only use unlink, let Wb35Tx_destroy free them */ |
| 161 | usb_unlink_urb( pWb35Tx->Tx4Urb ); | 161 | usb_unlink_urb( pWb35Tx->Tx4Urb ); |
| 162 | pr_debug("EP4 Tx stop\n"); | 162 | pr_debug("EP4 Tx stop\n"); |
| 163 | } | 163 | } |
| @@ -216,7 +216,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb) | |||
| 216 | pWb35Tx->EP2VM_status = pUrb->status; | 216 | pWb35Tx->EP2VM_status = pUrb->status; |
| 217 | 217 | ||
| 218 | /* For Linux 2.4. Interrupt will always trigger */ | 218 | /* For Linux 2.4. Interrupt will always trigger */ |
| 219 | if (pHwData->SurpriseRemove) /* Let WbWlanHalt to handle surprise remove */ | 219 | if (pHwData->SurpriseRemove) /* Let WbWlanHalt handle surprise remove */ |
| 220 | goto error; | 220 | goto error; |
| 221 | 221 | ||
| 222 | if (pWb35Tx->tx_halt) | 222 | if (pWb35Tx->tx_halt) |
