Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

5 files changed, 28 insertions, 25 deletions

diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index d3f14bee0f19..2a00707aba3b 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -257,8 +257,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch
 
         if (hdr & 0x10) {
                 BT_ERR("%s error in block", data->hdev->name);
-                if (data->reassembly)
-                        kfree_skb(data->reassembly);
+                kfree_skb(data->reassembly);
                 data->reassembly = NULL;
                 return -EIO;
         }
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index ff195c230825..d58e22b9f06a 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -359,9 +359,9 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
                         BT_ERR("Very strange (stat=0x%04x)", stat);
                 } else if ((stat & 0xff) != 0xff) {
                         if (stat & 0x0020) {
-                                int stat = bt3c_read(iobase, 0x7002) & 0x10;
+                                int status = bt3c_read(iobase, 0x7002) & 0x10;
                                 BT_INFO("%s: Antenna %s", info->hdev->name,
-                                                        stat ? "out" : "in");
+                                                        status ? "out" : "in");
                         }
                         if (stat & 0x0001)
                                 bt3c_receive(info);
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index b5fbda6d490a..e70c57ee4221 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -35,7 +35,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
-#define VERSION "0.4"
+#define VERSION "0.5"
 
 static int ignore_dga;
 static int ignore_csr;
@@ -171,6 +171,7 @@ struct btusb_data {
 
         __u8 cmdreq_type;
 
+        unsigned int sco_num;
         int isoc_altsetting;
         int suspend_count;
 };
@@ -496,11 +497,23 @@ static int btusb_open(struct hci_dev *hdev)
                 return 0;
 
         err = btusb_submit_intr_urb(hdev, GFP_KERNEL);
+        if (err < 0)
+                goto failed;
+
+        err = btusb_submit_bulk_urb(hdev, GFP_KERNEL);
         if (err < 0) {
-                clear_bit(BTUSB_INTR_RUNNING, &data->flags);
-                clear_bit(HCI_RUNNING, &hdev->flags);
+                usb_kill_anchored_urbs(&data->intr_anchor);
+                goto failed;
         }
 
+        set_bit(BTUSB_BULK_RUNNING, &data->flags);
+        btusb_submit_bulk_urb(hdev, GFP_KERNEL);
+
+        return 0;
+
+failed:
+        clear_bit(BTUSB_INTR_RUNNING, &data->flags);
+        clear_bit(HCI_RUNNING, &hdev->flags);
         return err;
 }
 
@@ -655,19 +668,10 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt)
 
         BT_DBG("%s evt %d", hdev->name, evt);
 
-        if (hdev->conn_hash.acl_num > 0) {
-                if (!test_and_set_bit(BTUSB_BULK_RUNNING, &data->flags)) {
-                        if (btusb_submit_bulk_urb(hdev, GFP_ATOMIC) < 0)
-                                clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-                        else
-                                btusb_submit_bulk_urb(hdev, GFP_ATOMIC);
-                }
-        } else {
-                clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-                usb_unlink_anchored_urbs(&data->bulk_anchor);
+        if (hdev->conn_hash.sco_num != data->sco_num) {
+                data->sco_num = hdev->conn_hash.sco_num;
+                schedule_work(&data->work);
         }
-
-        schedule_work(&data->work);
 }
 
 static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting)
@@ -982,9 +986,11 @@ static int btusb_resume(struct usb_interface *intf)
         }
 
         if (test_bit(BTUSB_BULK_RUNNING, &data->flags)) {
-                if (btusb_submit_bulk_urb(hdev, GFP_NOIO) < 0)
+                err = btusb_submit_bulk_urb(hdev, GFP_NOIO);
+                if (err < 0) {
                         clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-                else
+                        return err;
+                } else
                         btusb_submit_bulk_urb(hdev, GFP_NOIO);
         }
 
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index b0fafb055996..c0ce8134814e 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -102,8 +102,7 @@ static int h4_close(struct hci_uart *hu)
 
         skb_queue_purge(&h4->txq);
 
-        if (h4->rx_skb)
-                kfree_skb(h4->rx_skb);
+        kfree_skb(h4->rx_skb);
 
         hu->priv = NULL;
         kfree(h4);
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index b91d45a41b2f..5c65014635be 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -163,8 +163,7 @@ static int ll_close(struct hci_uart *hu)
         skb_queue_purge(&ll->tx_wait_q);
         skb_queue_purge(&ll->txq);
 
-        if (ll->rx_skb)
-                kfree_skb(ll->rx_skb);
+        kfree_skb(ll->rx_skb);
 
         hu->priv = NULL;