Merge branch 'driver-core-next' into Linux 3.2

[~andy/linux] / drivers / bluetooth / btusb.c

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index f9b726091ad0bba89464bad3a59f363318eba508..0c3e179b758900c2cf21f5de01f50f1d95463675 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -100,6 +100,9 @@ static struct usb_device_id btusb_table[] = {
        /* Canyon CN-BTU1 with HID interfaces */
        { USB_DEVICE(0x0c10, 0x0000) },
 
+       /* Broadcom BCM20702A0 */
+       { USB_DEVICE(0x413c, 0x8197) },
+
        { }     /* Terminating entry */
 };
 
@@ -774,9 +777,8 @@ skip_waking:
                usb_mark_last_busy(data->udev);
        }
 
-       usb_free_urb(urb);
-
 done:
+       usb_free_urb(urb);
        return err;
 }
 
@@ -1220,20 +1222,7 @@ static struct usb_driver btusb_driver = {
        .supports_autosuspend = 1,
 };
 
-static int __init btusb_init(void)
-{
-       BT_INFO("Generic Bluetooth USB driver ver %s", VERSION);
-
-       return usb_register(&btusb_driver);
-}
-
-static void __exit btusb_exit(void)
-{
-       usb_deregister(&btusb_driver);
-}
-
-module_init(btusb_init);
-module_exit(btusb_exit);
+module_usb_driver(btusb_driver);
 
 module_param(ignore_dga, bool, 0644);
 MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001");