From 0e0f7dd0a5ad6b34aebd3952d08f498aa52bb1a7 Mon Sep 17 00:00:00 2001 From: Harsh Kumar Date: Wed, 26 Sep 2012 23:33:39 +0530 Subject: [PATCH] --- yaml --- r: 325551 b: refs/heads/master c: 907af425a92a3e7cfac597ca324934f514b04d85 h: refs/heads/master i: 325549: 182563d0ec2fc20fe18e74523fa7c1b245dbf5aa 325547: 2d3a1b87c8f91b12ac2820e6be267ebe3df4062f 325543: 2188de577898a940d17b7bf3b0b9e079802591b1 325535: ceb9aa301b68bf805d7a2a5fbcc2bfa929f2cd1b v: v3 --- [refs] | 2 +- trunk/drivers/staging/winbond/wb35tx.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a707ec33d5d9..78706dacd9b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c6c4460e96e159df5dffaefc2d4b57500a56e95 +refs/heads/master: 907af425a92a3e7cfac597ca324934f514b04d85 diff --git a/trunk/drivers/staging/winbond/wb35tx.c b/trunk/drivers/staging/winbond/wb35tx.c index a4074fd9d30b..9a826957fe51 100644 --- a/trunk/drivers/staging/winbond/wb35tx.c +++ b/trunk/drivers/staging/winbond/wb35tx.c @@ -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) @@ -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"); } @@ -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)