diff --git a/[refs] b/[refs] index 16ce5af2cc34..845efff9b172 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ed2911c8f727077249fc5170a1ab842465aef21 +refs/heads/master: 17fb76165f307f7be2cfbc93958356fe50fa4791 diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c index 9a8eaf135a0d..e18efd43e3e0 100644 --- a/trunk/drivers/staging/vt6656/main_usb.c +++ b/trunk/drivers/staging/vt6656/main_usb.c @@ -955,7 +955,6 @@ static BOOL device_alloc_bufs(PSDevice pDevice) { pDevice->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC); if (pDevice->pInterruptURB == NULL) { DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int urb\n"); - usb_kill_urb(pDevice->pControlURB); usb_free_urb(pDevice->pControlURB); goto free_rx_tx; } @@ -963,8 +962,6 @@ static BOOL device_alloc_bufs(PSDevice pDevice) { pDevice->intBuf.pDataBuf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL); if (pDevice->intBuf.pDataBuf == NULL) { DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int buf\n"); - usb_kill_urb(pDevice->pControlURB); - usb_kill_urb(pDevice->pInterruptURB); usb_free_urb(pDevice->pControlURB); usb_free_urb(pDevice->pInterruptURB); goto free_rx_tx;