[PATCH 05/10] staging: vt6656: s_nsBulkInUsbIoCompleteRead Remove bytesRead/bIndicateReceive.
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: 2014-02-25 20:53:51
Subsystem:
staging subsystem, the rest · Maintainers:
Greg Kroah-Hartman, Linus Torvalds
Replace with urb->actual_length. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> --- drivers/staging/vt6656/usbpipe.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 2f8e8e6..87601b7 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c@@ -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); }
--
1.9.0