Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	include/net/bluetooth/bluetooth.h

1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index f9b726091ad0..2bd87d45f1c2 100644
--- 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 */
 };
 
@@ -312,7 +315,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);
         }
@@ -397,7 +401,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);
         }
@@ -520,7 +525,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);
         }
@@ -724,6 +730,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;
 
@@ -767,7 +776,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 {