staging: vt6656: return if pControlURB->hcpriv not NULL
authorMalcolm Priestley <tvboxspy@gmail.com>
Mon, 14 Oct 2013 18:44:13 +0000 (19:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 15 Oct 2013 16:42:13 +0000 (09:42 -0700)
Fixes occasional urb submitted while active.

Even thought the fMP_CONTROL_WRITES/fMP_CONTROL_READS flags
are cleared in the return context urb->hcpriv is not NULL.

check for hcpriv and return STATUS_FAILURE if not NULL.

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

index fc9b6ee4849ca80082f3134fa93f24b31f7f2ddc..5fc18ad822d3046f65cf4205c4484dccbf85e16b 100644 (file)
@@ -118,6 +118,9 @@ int PIPEnsControlOut(struct vnt_private *pDevice, u8 byRequest, u16 wValue,
        if (pDevice->Flags & fMP_CONTROL_READS)
                return STATUS_FAILURE;
 
+       if (pDevice->pControlURB->hcpriv)
+               return STATUS_FAILURE;
+
        MP_SET_FLAG(pDevice, fMP_CONTROL_WRITES);
 
        pDevice->sUsbCtlRequest.bRequestType = 0x40;
@@ -177,6 +180,9 @@ int PIPEnsControlIn(struct vnt_private *pDevice, u8 byRequest, u16 wValue,
        if (pDevice->Flags & fMP_CONTROL_WRITES)
                return STATUS_FAILURE;
 
+       if (pDevice->pControlURB->hcpriv)
+               return STATUS_FAILURE;
+
        MP_SET_FLAG(pDevice, fMP_CONTROL_READS);
 
        pDevice->sUsbCtlRequest.bRequestType = 0xC0;