diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-25 16:18:17 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-26 22:53:25 +0200 |
commit | 29d880cb271c763bb2142da243bc026ccf2cd3e1 (patch) | |
tree | 4c96c391ae1dd4fa3952da27a7f3b198996ff2d4 /patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch | |
parent | da63fce9197d6383df0a8372fc4da5c9a4fccd17 (diff) |
patches: refresh patches on next-20150424backports-20150424
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.68 [ OK ]
4 3.3.8 [ OK ]
5 3.4.106 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.73 [ OK ]
12 3.11.10 [ OK ]
13 3.12.39 [ OK ]
14 3.13.11 [ OK ]
15 3.14.37 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.10 [ OK ]
20 3.19.3 [ OK ]
21 4.0-rc6 [ OK ]
manual changes done to
patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch')
-rw-r--r-- | patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch index 35297c72..22e8c2dd 100644 --- a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch +++ b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch @@ -1,32 +1,32 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1841,8 +1841,12 @@ static int btusb_recv_event_intel(struct - if (test_and_clear_bit(BTUSB_DOWNLOADING, - &data->flags) && - test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) { +@@ -2151,8 +2151,12 @@ static void btusb_intel_bootup(struct bt + return; + + if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - smp_mb__after_atomic(); - wake_up_bit(&data->flags, BTUSB_DOWNLOADING); + smp_mb__after_atomic(); + wake_up_bit(&data->flags, BTUSB_BOOTING); +#else -+ wake_up_interruptible(&hdev->req_wait_q); ++ wake_up_interruptible(&data->hdev->req_wait_q); +#endif - } - } + } + } -@@ -1853,8 +1857,12 @@ static int btusb_recv_event_intel(struct - if (skb->len == 9 && hdr->evt == 0xff && hdr->plen == 0x07 && - skb->data[2] == 0x02) { - if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) { +@@ -2169,8 +2173,12 @@ static void btusb_intel_secure_send_resu + + if (test_and_clear_bit(BTUSB_DOWNLOADING, &data->flags) && + test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - smp_mb__after_atomic(); - wake_up_bit(&data->flags, BTUSB_BOOTING); + smp_mb__after_atomic(); + wake_up_bit(&data->flags, BTUSB_DOWNLOADING); +#else -+ wake_up_interruptible(&hdev->req_wait_q); ++ wake_up_interruptible(&data->hdev->req_wait_q); +#endif - } - } } -@@ -2222,6 +2230,7 @@ static int btusb_setup_intel_new(struct + } + +@@ -2569,6 +2577,7 @@ static int btusb_setup_intel_new(struct * and thus just timeout if that happens and fail the setup * of this device. */ @@ -34,7 +34,7 @@ err = wait_on_bit_timeout(&data->flags, BTUSB_DOWNLOADING, TASK_INTERRUPTIBLE, msecs_to_jiffies(5000)); -@@ -2236,6 +2245,31 @@ static int btusb_setup_intel_new(struct +@@ -2583,6 +2592,31 @@ static int btusb_setup_intel_new(struct err = -ETIMEDOUT; goto done; } @@ -66,7 +66,7 @@ if (test_bit(BTUSB_FIRMWARE_FAILED, &data->flags)) { BT_ERR("%s: Firmware loading failed", hdev->name); -@@ -2275,6 +2309,7 @@ done: +@@ -2622,6 +2656,7 @@ done: */ BT_INFO("%s: Waiting for device to boot", hdev->name); @@ -74,7 +74,7 @@ err = wait_on_bit_timeout(&data->flags, BTUSB_BOOTING, TASK_INTERRUPTIBLE, msecs_to_jiffies(1000)); -@@ -2288,6 +2323,33 @@ done: +@@ -2635,6 +2670,33 @@ done: BT_ERR("%s: Device boot timeout", hdev->name); return -ETIMEDOUT; } |