USB: Fixes for previous USB_* flag patch.

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 414029971cba69ccb670bb27e8c9a78d03f2a6e7..bd3467543386f07e2d7058f01463e57564361f68 100644 (file)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1150,9 +1150,9 @@ static int hcd_unlink_urb (struct urb *urb)
         * lower level hcd code is always async, locking on urb->status
         * updates; an intercepted completion unblocks us.
         */
-       if ((urb->transfer_flags & USB_TIMEOUT_KILLED))
+       if ((urb->transfer_flags & URB_TIMEOUT_KILLED))
                urb->status = -ETIMEDOUT;
-       else if (!(urb->transfer_flags & USB_ASYNC_UNLINK)) {
+       else if (!(urb->transfer_flags & URB_ASYNC_UNLINK)) {
                if (in_interrupt ()) {
                        dbg ("non-async unlink in_interrupt");
                        retval = -EWOULDBLOCK;

diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 025ba808324deb5c3b1745cc9d9a619dbe7b6b17..021a88e0ac3f001b277dc0a2399c5085da2e0810 100644 (file)
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -1957,7 +1957,7 @@ static int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
        usb_fill_bulk_urb (urb, dev->udev,
                        usb_sndbulkpipe (dev->udev, info->out),
                        skb->data, skb->len, tx_complete, skb);
-       urb->transfer_flags |= USB_ASYNC_UNLINK;
+       urb->transfer_flags |= URB_ASYNC_UNLINK;
        // FIXME urb->timeout = ... jiffies ... ;
 
        spin_lock_irqsave (&dev->txq.lock, flags);