staging: vt6656: s_nsBulkInUsbIoCompleteRead Remove bytesRead/bIndicateReceive.
authorMalcolm Priestley <tvboxspy@gmail.com>
Tue, 25 Feb 2014 20:51:47 +0000 (20:51 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Feb 2014 21:04:36 +0000 (13:04 -0800)
Replace with urb->actual_length.

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

index 2f8e8e6..87601b7 100644 (file)
@@ -469,14 +469,10 @@ static void s_nsBulkInUsbIoCompleteRead(struct urb *urb)
 {
        struct vnt_rcb *pRCB = (struct vnt_rcb *)urb->context;
        struct vnt_private *pDevice = pRCB->pDevice;
-       unsigned long   bytesRead;
-       int bIndicateReceive = false;
        int bReAllocSkb = false;
 
     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkInUsbIoCompleteRead\n");
 
-    bytesRead = urb->actual_length;
-
     if (urb->status) {
         pDevice->ulBulkInError++;
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BULK In failed %d\n", urb->status);
@@ -489,15 +485,13 @@ static void s_nsBulkInUsbIoCompleteRead(struct urb *urb)
 //            MP_SET_FLAG(pDevice, fMP_DISCONNECTED);
 //        }
     } else {
-       if (bytesRead)
-               bIndicateReceive = true;
         pDevice->ulBulkInContCRCError = 0;
-        pDevice->ulBulkInBytesRead += bytesRead;
+       pDevice->ulBulkInBytesRead += urb->actual_length;
     }
 
-    if (bIndicateReceive) {
+    if (urb->actual_length) {
         spin_lock(&pDevice->lock);
-        if (RXbBulkInProcessData(pDevice, pRCB, bytesRead) == true)
+       if (RXbBulkInProcessData(pDevice, pRCB, urb->actual_length) == true)
             bReAllocSkb = true;
         spin_unlock(&pDevice->lock);
     }