Commit afd98826 authored by Vojtech Pavlik's avatar Vojtech Pavlik Committed by Greg Kroah-Hartman

USB 64bit fixes

parent 15e1d2dc
...@@ -476,7 +476,7 @@ static void catc_ctrl_done(struct urb *urb) ...@@ -476,7 +476,7 @@ static void catc_ctrl_done(struct urb *urb)
{ {
struct catc *catc = urb->context; struct catc *catc = urb->context;
struct ctrl_queue *q; struct ctrl_queue *q;
long flags; unsigned long flags;
if (urb->status) if (urb->status)
dbg("ctrl_done, status %d, len %d.", urb->status, urb->actual_length); dbg("ctrl_done, status %d, len %d.", urb->status, urb->actual_length);
...@@ -510,7 +510,7 @@ static int catc_ctrl_async(struct catc *catc, u8 dir, u8 request, u16 value, ...@@ -510,7 +510,7 @@ static int catc_ctrl_async(struct catc *catc, u8 dir, u8 request, u16 value,
{ {
struct ctrl_queue *q; struct ctrl_queue *q;
int retval = 0; int retval = 0;
long flags; unsigned long flags;
spin_lock_irqsave(&catc->ctrl_lock, flags); spin_lock_irqsave(&catc->ctrl_lock, flags);
......
...@@ -171,7 +171,7 @@ _static void uhci_switch_timer_int(uhci_t *s) ...@@ -171,7 +171,7 @@ _static void uhci_switch_timer_int(uhci_t *s)
#ifdef CONFIG_USB_UHCI_HIGH_BANDWIDTH #ifdef CONFIG_USB_UHCI_HIGH_BANDWIDTH
_static void enable_desc_loop(uhci_t *s, struct urb *urb) _static void enable_desc_loop(uhci_t *s, struct urb *urb)
{ {
int flags; unsigned long flags;
if (urb->transfer_flags & USB_NO_FSBR) if (urb->transfer_flags & USB_NO_FSBR)
return; return;
...@@ -186,7 +186,7 @@ _static void enable_desc_loop(uhci_t *s, struct urb *urb) ...@@ -186,7 +186,7 @@ _static void enable_desc_loop(uhci_t *s, struct urb *urb)
/*-------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
_static void disable_desc_loop(uhci_t *s, struct urb *urb) _static void disable_desc_loop(uhci_t *s, struct urb *urb)
{ {
int flags; unsigned long flags;
if (urb->transfer_flags & USB_NO_FSBR) if (urb->transfer_flags & USB_NO_FSBR)
return; return;
......
...@@ -989,9 +989,8 @@ static int net1080_rx_fixup (struct usbnet *dev, struct sk_buff *skb) ...@@ -989,9 +989,8 @@ static int net1080_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
|| skb->len > FRAMED_SIZE (dev->net.mtu)) { || skb->len > FRAMED_SIZE (dev->net.mtu)) {
dev->stats.rx_frame_errors++; dev->stats.rx_frame_errors++;
dbg ("rx framesize %d range %d..%d mtu %d", skb->len, dbg ("rx framesize %d range %d..%d mtu %d", skb->len,
MIN_FRAMED, FRAMED_SIZE (dev->net.mtu), (int)MIN_FRAMED, (int)FRAMED_SIZE (dev->net.mtu),
dev->net.mtu dev->net.mtu);
);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment