ChangeSet 1.1843.4.20, 2004/08/24 15:11:07-07:00, [EMAIL PROTECTED]
USB: Remove struct urb->timeout as it does not work
Well, it works only for UHCI controllers, but that's not acceptable...
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
drivers/net/irda/irda-usb.c | 3 ---
drivers/usb/host/uhci-hcd.c | 7 -------
drivers/usb/media/stv680.c | 1 -
include/linux/usb.h | 7 ++-----
4 files changed, 2 insertions(+), 16 deletions(-)
diff -Nru a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
--- a/drivers/net/irda/irda-usb.c 2004-08-26 16:41:56 -07:00
+++ b/drivers/net/irda/irda-usb.c 2004-08-26 16:41:56 -07:00
@@ -268,7 +268,6 @@
speed_bulk_callback, self);
urb->transfer_buffer_length = USB_IRDA_HEADER;
urb->transfer_flags = URB_ASYNC_UNLINK;
- urb->timeout = msecs_to_jiffies(100);
/* Irq disabled -> GFP_ATOMIC */
if ((ret = usb_submit_urb(urb, GFP_ATOMIC))) {
@@ -411,8 +410,6 @@
* after each of our packets that is exact multiple of the frame size.
* This is how the dongle will detect the end of packet - Jean II */
urb->transfer_flags |= URB_ZERO_PACKET;
- /* Timeout need to be shorter than NET watchdog timer */
- urb->timeout = msecs_to_jiffies(200);
/* Generate min turn time. FIXME: can we do better than this? */
/* Trying to a turnaround time at this level is trying to measure
diff -Nru a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
--- a/drivers/usb/host/uhci-hcd.c 2004-08-26 16:41:56 -07:00
+++ b/drivers/usb/host/uhci-hcd.c 2004-08-26 16:41:56 -07:00
@@ -1633,13 +1633,6 @@
if (up->fsbr && !up->fsbr_timeout && time_after_eq(jiffies,
up->fsbrtime + IDLE_TIMEOUT))
uhci_fsbr_timeout(uhci, u);
- /* Check if the URB timed out */
- if (u->timeout && u->status == -EINPROGRESS &&
- time_after_eq(jiffies, up->inserttime + u->timeout)) {
- u->status = -ETIMEDOUT;
- list_move_tail(&up->urb_list, &list);
- }
-
spin_unlock(&u->lock);
}
spin_unlock_irqrestore(&uhci->schedule_lock, flags);
diff -Nru a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
--- a/drivers/usb/media/stv680.c 2004-08-26 16:41:56 -07:00
+++ b/drivers/usb/media/stv680.c 2004-08-26 16:41:56 -07:00
@@ -704,7 +704,6 @@
usb_rcvbulkpipe (stv680->udev,
stv680->bulk_in_endpointAddr),
stv680->sbuf[i].data, stv680->rawbufsize,
stv680_video_irq, stv680);
- urb->timeout = PENCAM_TIMEOUT * 2;
stv680->urb[i] = urb;
err = usb_submit_urb (stv680->urb[i], GFP_KERNEL);
if (err)
diff -Nru a/include/linux/usb.h b/include/linux/usb.h
--- a/include/linux/usb.h 2004-08-26 16:41:56 -07:00
+++ b/include/linux/usb.h 2004-08-26 16:41:56 -07:00
@@ -651,8 +651,6 @@
* it likes with the URB, including resubmitting or freeing it.
* @iso_frame_desc: Used to provide arrays of ISO transfer buffers and to
* collect the transfer status for each buffer.
- * @timeout: If set to zero, the urb will never timeout. Otherwise this is
- * the time in jiffies that this urb will timeout in.
*
* This structure identifies USB transfer requests. URBs must be allocated by
* calling usb_alloc_urb() and freed with a call to usb_free_urb().
@@ -682,8 +680,8 @@
*
* Initialization:
*
- * All URBs submitted must initialize dev, pipe,
- * transfer_flags (may be zero), complete, timeout (may be zero).
+ * All URBs submitted must initialize the dev, pipe, transfer_flags (may be
+ * zero), and complete fields.
* The URB_ASYNC_UNLINK transfer flag affects later invocations of
* the usb_unlink_urb() routine. Note: Failure to set URB_ASYNC_UNLINK
* with usb_unlink_urb() is deprecated. For synchronous unlinks use
@@ -783,7 +781,6 @@
int number_of_packets; /* (in) number of ISO packets */
int interval; /* (modify) transfer interval (INT/ISO) */
int error_count; /* (return) number of ISO errors */
- int timeout; /* (in) timeout, in jiffies */
void *context; /* (in) context for completion */
usb_complete_t complete; /* (in) completion routine */
struct usb_iso_packet_descriptor iso_frame_desc[0]; /* (in) ISO ONLY */
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
