# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.561 -> 1.562
# drivers/usb/uhci.c 1.29 -> 1.30
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/03/25 [EMAIL PROTECTED] 1.562
# [PATCH] 2.4.19-pre3 uhci.c zero packet
#
# Don't know if you saw this on the list or not. Here's a patch which
# fixes zero packet support for uhci.c
#
# - Setup the TD correctly, we weren't shifting the null data size
# - Only add the zero packet if the transfer was a multiple of the
# endpoint of the size
#
# JE
# --------------------------------------------
#
diff -Nru a/drivers/usb/uhci.c b/drivers/usb/uhci.c
--- a/drivers/usb/uhci.c Wed Apr 3 16:39:38 2002
+++ b/drivers/usb/uhci.c Wed Apr 3 16:39:38 2002
@@ -1264,20 +1264,29 @@
data);
data += pktsze;
- len -= pktsze;
+ len -= maxsze;
usb_dotoggle(urb->dev, usb_pipeendpoint(urb->pipe),
usb_pipeout(urb->pipe));
} while (len > 0);
+ /*
+ * USB_ZERO_PACKET means adding a 0-length packet, if
+ * direction is OUT and the transfer_length was an
+ * exact multiple of maxsze, hence
+ * (len = transfer_length - N * maxsze) == 0
+ * however, if transfer_length == 0, the zero packet
+ * was already prepared above.
+ */
if (usb_pipeout(urb->pipe) && (urb->transfer_flags & USB_ZERO_PACKET) &&
- urb->transfer_buffer_length) {
+ !len && urb->transfer_buffer_length) {
td = uhci_alloc_td(uhci, urb->dev);
if (!td)
return -ENOMEM;
uhci_add_td_to_urb(urb, td);
- uhci_fill_td(td, status, destination | UHCI_NULL_DATA_SIZE |
+ uhci_fill_td(td, status, destination |
+ (UHCI_NULL_DATA_SIZE << 21) |
(usb_gettoggle(urb->dev, usb_pipeendpoint(urb->pipe),
usb_pipeout(urb->pipe)) << TD_TOKEN_TOGGLE),
data);
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
