# 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.580 -> 1.581
# drivers/usb/usbnet.c 1.15 -> 1.16
# drivers/usb/usb-uhci.c 1.29 -> 1.30
# drivers/usb/catc.c 1.10 -> 1.11
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/04/03 [EMAIL PROTECTED] 1.581
# USB 64bit fixes
# --------------------------------------------
#
diff -Nru a/drivers/usb/catc.c b/drivers/usb/catc.c
--- a/drivers/usb/catc.c Wed Apr 3 16:39:03 2002
+++ b/drivers/usb/catc.c Wed Apr 3 16:39:03 2002
@@ -476,7 +476,7 @@
{
struct catc *catc = urb->context;
struct ctrl_queue *q;
- long flags;
+ unsigned long flags;
if (urb->status)
dbg("ctrl_done, status %d, len %d.", urb->status, urb->actual_length);
@@ -510,7 +510,7 @@
{
struct ctrl_queue *q;
int retval = 0;
- long flags;
+ unsigned long flags;
spin_lock_irqsave(&catc->ctrl_lock, flags);
diff -Nru a/drivers/usb/usb-uhci.c b/drivers/usb/usb-uhci.c
--- a/drivers/usb/usb-uhci.c Wed Apr 3 16:39:03 2002
+++ b/drivers/usb/usb-uhci.c Wed Apr 3 16:39:03 2002
@@ -171,7 +171,7 @@
#ifdef CONFIG_USB_UHCI_HIGH_BANDWIDTH
_static void enable_desc_loop(uhci_t *s, struct urb *urb)
{
- int flags;
+ unsigned long flags;
if (urb->transfer_flags & USB_NO_FSBR)
return;
@@ -186,7 +186,7 @@
/*-------------------------------------------------------------------*/
_static void disable_desc_loop(uhci_t *s, struct urb *urb)
{
- int flags;
+ unsigned long flags;
if (urb->transfer_flags & USB_NO_FSBR)
return;
diff -Nru a/drivers/usb/usbnet.c b/drivers/usb/usbnet.c
--- a/drivers/usb/usbnet.c Wed Apr 3 16:39:03 2002
+++ b/drivers/usb/usbnet.c Wed Apr 3 16:39:03 2002
@@ -989,9 +989,8 @@
|| skb->len > FRAMED_SIZE (dev->net.mtu)) {
dev->stats.rx_frame_errors++;
dbg ("rx framesize %d range %d..%d mtu %d", skb->len,
- MIN_FRAMED, FRAMED_SIZE (dev->net.mtu),
- dev->net.mtu
- );
+ (int)MIN_FRAMED, (int)FRAMED_SIZE (dev->net.mtu),
+ dev->net.mtu);
return 0;
}
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
