Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1882c19c authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: s_nsBulkInUsbIoCompleteRead Remove bytesRead/bIndicateReceive. 



Replace with urb->actual_length.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3a8fa17

drivers/staging/vt6656/usbpipe.c

+3 −9
Original line number Diff line number Diff line
@@ -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);

    }