USB

minor -dj tree updates.

diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 566da376d553b1a3a0d4f5e374afdcc293fe75c3..f0f41b7a91300f993d485cd0a731775eb5b6d4f5 100644 (file)
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -9,6 +9,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/compiler.h>    /* likely()/unlikely() */
 
 /*
  * Hub request types

diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 92d736389e3b3458976a22e88c33752b40e7a7bf..cbe2a13fc9670c01f6649c1f817aaa96085b1724 100644 (file)
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1477,20 +1477,20 @@ static void hid_disconnect(struct usb_device *dev, void *ptr)
 {
        struct hid_device *hid = ptr;
 
+       dbg("cleanup called");
        usb_unlink_urb(hid->urbin);
        usb_unlink_urb(hid->urbout);
        usb_unlink_urb(hid->urbctrl);
 
-       if (hid->claimed & HID_CLAIMED_INPUT)
-               hidinput_disconnect(hid);
-       if (hid->claimed & HID_CLAIMED_HIDDEV)
-               hiddev_disconnect(hid);
-
        usb_free_urb(hid->urbin);
        usb_free_urb(hid->urbctrl);
        if (hid->urbout)
                usb_free_urb(hid->urbout);
 
+       if (hid->claimed & HID_CLAIMED_INPUT)
+               hidinput_disconnect(hid);
+       if (hid->claimed & HID_CLAIMED_HIDDEV)
+               hiddev_disconnect(hid);
        hid_free_device(hid);
 }
 

diff --git a/drivers/usb/serial/usbserial.c b/drivers/usb/serial/usbserial.c
index 0ffdae91b8bd04e27cf533389a5e97536829b172..5a5b658b796678ee228f6afb073d09e4dfdf3fc0 100644 (file)
--- a/drivers/usb/serial/usbserial.c
+++ b/drivers/usb/serial/usbserial.c
@@ -1665,7 +1665,7 @@ EXPORT_SYMBOL(usb_serial_deregister);
 #if 0
 static kdev_t usb_console_device(struct console *co)
 {
-       return MKDEV(SERIAL_TTY_MAJOR, co->index);      /* TBD */
+       return mk_kdev(SERIAL_TTY_MAJOR, co->index);    /* TBD */
 }
 #endif