Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325551
b: refs/heads/master
c: 907af42
h: refs/heads/master
i:
  325549: 182563d
  325547: 2d3a1b8
  325543: 2188de5
  325535: ceb9aa3
v: v3
  • Loading branch information
Harsh Kumar authored and Greg Kroah-Hartman committed Sep 26, 2012
1 parent c171527 commit 0e0f7dd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c6c4460e96e159df5dffaefc2d4b57500a56e95
refs/heads/master: 907af425a92a3e7cfac597ca324934f514b04d85
8 changes: 4 additions & 4 deletions trunk/drivers/staging/winbond/wb35tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static void Wb35Tx_complete(struct urb * pUrb)
pWb35Tx->TxSendIndex++;
pWb35Tx->TxSendIndex %= MAX_USB_TX_BUFFER_NUMBER;

if (pHwData->SurpriseRemove) /* Let WbWlanHalt to handle surprise remove */
if (pHwData->SurpriseRemove) /* Let WbWlanHalt handle surprise remove */
goto error;

if (pWb35Tx->tx_halt)
Expand Down Expand Up @@ -151,13 +151,13 @@ void Wb35Tx_stop(struct hw_data * pHwData)

/* Try to cancel the Trp of EP2 */
if (pWb35Tx->EP2vm_state == VM_RUNNING)
/* Only use unlink, let Wb35Tx_destroy to free them */
/* Only use unlink, let Wb35Tx_destroy free them */
usb_unlink_urb( pWb35Tx->Tx2Urb );
pr_debug("EP2 Tx stop\n");

/* Try to cancel the Irp of EP4 */
if (pWb35Tx->EP4vm_state == VM_RUNNING)
/* Only use unlink, let Wb35Tx_destroy to free them */
/* Only use unlink, let Wb35Tx_destroy free them */
usb_unlink_urb( pWb35Tx->Tx4Urb );
pr_debug("EP4 Tx stop\n");
}
Expand Down Expand Up @@ -216,7 +216,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb)
pWb35Tx->EP2VM_status = pUrb->status;

/* For Linux 2.4. Interrupt will always trigger */
if (pHwData->SurpriseRemove) /* Let WbWlanHalt to handle surprise remove */
if (pHwData->SurpriseRemove) /* Let WbWlanHalt handle surprise remove */
goto error;

if (pWb35Tx->tx_halt)
Expand Down

0 comments on commit 0e0f7dd

Please sign in to comment.