8 files changed, 40 insertions, 34 deletions

diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index cf77a9a2bfa4..07f14d10ea49 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -30,6 +30,7 @@
 #include <net/bluetooth/bluetooth.h>
 
 #define VERSION "1.0"
+#define ATH3K_FIRMWARE  "ath3k-1.fw"
 
 #define ATH3K_DNLOAD                            0x01
 #define ATH3K_GETSTATE                          0x05
@@ -400,9 +401,15 @@ static int ath3k_probe(struct usb_interface *intf,
                 return 0;
         }
 
-        if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
-                BT_ERR("Error loading firmware");
-                return -EIO;
+        ret = request_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);
+        if (ret < 0) {
+                if (ret == -ENOENT)
+                        BT_ERR("Firmware file \"%s\" not found",
+                                                        ATH3K_FIRMWARE);
+                else
+                        BT_ERR("Firmware file \"%s\" request failed (err=%d)",
+                                                        ATH3K_FIRMWARE, ret);
+                return ret;
         }
 
         ret = ath3k_load_firmware(udev, firmware);
@@ -429,4 +436,4 @@ MODULE_AUTHOR("Atheros Communications");
 MODULE_DESCRIPTION("Atheros AR30xx firmware driver");
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("ath3k-1.fw");
+MODULE_FIRMWARE(ATH3K_FIRMWARE);
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index e64a290a1b98..a323baee51b0 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -751,9 +751,7 @@ static void bfusb_disconnect(struct usb_interface *intf)
 
         bfusb_close(hdev);
 
-        if (hci_unregister_dev(hdev) < 0)
-                BT_ERR("Can't unregister HCI device %s", hdev->name);
-
+        hci_unregister_dev(hdev);
         hci_free_dev(hdev);
 }
 
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index aed1904ea67b..c6a0c6103743 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -844,9 +844,7 @@ static int bluecard_close(bluecard_info_t *info)
         /* Turn FPGA off */
         outb(0x80, iobase + 0x30);
 
-        if (hci_unregister_dev(hdev) < 0)
-                BT_ERR("Can't unregister HCI device %s", hdev->name);
-
+        hci_unregister_dev(hdev);
         hci_free_dev(hdev);
 
         return 0;
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 4fc01949d399..0c97e5d514b6 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -636,9 +636,7 @@ static int bt3c_close(bt3c_info_t *info)
 
         bt3c_hci_close(hdev);
 
-        if (hci_unregister_dev(hdev) < 0)
-                BT_ERR("Can't unregister HCI device %s", hdev->name);
-
+        hci_unregister_dev(hdev);
         hci_free_dev(hdev);
 
         return 0;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 526b61807d94..200b3a2877d6 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -565,9 +565,7 @@ static int btuart_close(btuart_info_t *info)
 
         spin_unlock_irqrestore(&(info->lock), flags);
 
-        if (hci_unregister_dev(hdev) < 0)
-                BT_ERR("Can't unregister HCI device %s", hdev->name);
-
+        hci_unregister_dev(hdev);
         hci_free_dev(hdev);
 
         return 0;
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 0c3e179b7589..55ac349695c4 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -101,6 +101,7 @@ static struct usb_device_id btusb_table[] = {
         { USB_DEVICE(0x0c10, 0x0000) },
 
         /* Broadcom BCM20702A0 */
+        { USB_DEVICE(0x0a5c, 0x21e3) },
         { USB_DEVICE(0x413c, 0x8197) },
 
         { }     /* Terminating entry */
@@ -315,7 +316,8 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)
 
         err = usb_submit_urb(urb, mem_flags);
         if (err < 0) {
-                BT_ERR("%s urb %p submission failed (%d)",
+                if (err != -EPERM && err != -ENODEV)
+                        BT_ERR("%s urb %p submission failed (%d)",
                                                 hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
@@ -400,7 +402,8 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
 
         err = usb_submit_urb(urb, mem_flags);
         if (err < 0) {
-                BT_ERR("%s urb %p submission failed (%d)",
+                if (err != -EPERM && err != -ENODEV)
+                        BT_ERR("%s urb %p submission failed (%d)",
                                                 hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
@@ -506,15 +509,10 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
 
         pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress);
 
-        urb->dev      = data->udev;
-        urb->pipe     = pipe;
-        urb->context  = hdev;
-        urb->complete = btusb_isoc_complete;
-        urb->interval = data->isoc_rx_ep->bInterval;
+        usb_fill_int_urb(urb, data->udev, pipe, buf, size, btusb_isoc_complete,
+                                hdev, data->isoc_rx_ep->bInterval);
 
         urb->transfer_flags  = URB_FREE_BUFFER | URB_ISO_ASAP;
-        urb->transfer_buffer = buf;
-        urb->transfer_buffer_length = size;
 
         __fill_isoc_descriptor(urb, size,
                         le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize));
@@ -523,7 +521,8 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
 
         err = usb_submit_urb(urb, mem_flags);
         if (err < 0) {
-                BT_ERR("%s urb %p submission failed (%d)",
+                if (err != -EPERM && err != -ENODEV)
+                        BT_ERR("%s urb %p submission failed (%d)",
                                                 hdev->name, urb, -err);
                 usb_unanchor_urb(urb);
         }
@@ -727,6 +726,9 @@ static int btusb_send_frame(struct sk_buff *skb)
                 usb_fill_bulk_urb(urb, data->udev, pipe,
                                 skb->data, skb->len, btusb_tx_complete, skb);
 
+                if (skb->priority >= HCI_PRIO_MAX - 1)
+                        urb->transfer_flags  = URB_ISO_ASAP;
+
                 hdev->stat.acl_tx++;
                 break;
 
@@ -770,7 +772,9 @@ skip_waking:
 
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err < 0) {
-                BT_ERR("%s urb %p submission failed", hdev->name, urb);
+                if (err != -EPERM && err != -ENODEV)
+                        BT_ERR("%s urb %p submission failed (%d)",
+                                                hdev->name, urb, -err);
                 kfree(urb->setup_packet);
                 usb_unanchor_urb(urb);
         } else {
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 5e4c2de9fc3f..969bb22e493f 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -551,9 +551,7 @@ static int dtl1_close(dtl1_info_t *info)
 
         spin_unlock_irqrestore(&(info->lock), flags);
 
-        if (hci_unregister_dev(hdev) < 0)
-                BT_ERR("Can't unregister HCI device %s", hdev->name);
-
+        hci_unregister_dev(hdev);
         hci_free_dev(hdev);
 
         return 0;
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 67c180c2c1e0..2ed6ab1c6e1b 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -41,6 +41,8 @@
 
 #define VERSION "1.3"
 
+static bool amp;
+
 struct vhci_data {
         struct hci_dev *hdev;
 
@@ -239,6 +241,9 @@ static int vhci_open(struct inode *inode, struct file *file)
         hdev->bus = HCI_VIRTUAL;
         hdev->driver_data = data;
 
+        if (amp)
+                hdev->dev_type = HCI_AMP;
+
         hdev->open     = vhci_open_dev;
         hdev->close    = vhci_close_dev;
         hdev->flush    = vhci_flush;
@@ -264,10 +269,7 @@ static int vhci_release(struct inode *inode, struct file *file)
         struct vhci_data *data = file->private_data;
         struct hci_dev *hdev = data->hdev;
 
-        if (hci_unregister_dev(hdev) < 0) {
-                BT_ERR("Can't unregister HCI device %s", hdev->name);
-        }
-
+        hci_unregister_dev(hdev);
         hci_free_dev(hdev);
 
         file->private_data = NULL;
@@ -306,6 +308,9 @@ static void __exit vhci_exit(void)
 module_init(vhci_init);
 module_exit(vhci_exit);
 
+module_param(amp, bool, 0644);
+MODULE_PARM_DESC(amp, "Create AMP controller device");
+
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
 MODULE_VERSION(VERSION);