diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-29 14:19:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-29 14:19:32 +1000 |
| commit | 173a1caceaa301720d2d0521ec282c7d9b4d664b (patch) | |
| tree | b5bdf625e472ee8679ea866f2aa77e8020d370a6 /drivers/staging/vt6656/usbpipe.c | |
| parent | 4282a20a1d2e5c1be92d839c9baa4671123b4349 (diff) | |
| parent | 12513b76a021e5b41a9d5d5981da75dfd6480890 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
Diffstat (limited to 'drivers/staging/vt6656/usbpipe.c')
| -rw-r--r-- | drivers/staging/vt6656/usbpipe.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index fd2355e34fb0..e1d41023c480 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -381,17 +381,6 @@ PIPEnsInterruptRead( // Now that we have created the urb, we will send a // request to the USB device object. // -#if 0 //reserve int URB submit - usb_fill_int_urb(pDevice->pInterruptURB, - pDevice->usb, - usb_rcvintpipe(pDevice->usb, 1), - (void *) pDevice->intBuf.pDataBuf, - MAX_INTERRUPT_SIZE, - s_nsInterruptUsbIoCompleteRead, - pDevice, - pDevice->int_interval - ); -#else //replace int URB submit by bulk transfer #ifndef Safe_Close usb_fill_int_urb(pDevice->pInterruptURB, pDevice->usb, @@ -414,7 +403,6 @@ usb_fill_bulk_urb(pDevice->pInterruptURB, s_nsInterruptUsbIoCompleteRead, pDevice); #endif -#endif ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC); if (ntStatus != 0) { @@ -495,12 +483,6 @@ s_nsInterruptUsbIoCompleteRead( if (pDevice->fKillEventPollingThread != TRUE) { - #if 0 //reserve int URB submit - ntStatus = usb_submit_urb(urb, GFP_ATOMIC); - if (ntStatus != 0) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Re-Submit int URB failed %d\n", ntStatus); - } - #else //replace int URB submit by bulk transfer #ifdef Safe_Close usb_fill_bulk_urb(pDevice->pInterruptURB, pDevice->usb, @@ -518,7 +500,6 @@ s_nsInterruptUsbIoCompleteRead( #else tasklet_schedule(&pDevice->EventWorkItem); #endif -#endif } // // We return STATUS_MORE_PROCESSING_REQUIRED so that the completion |