diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-27 22:47:25 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-28 23:20:27 +0200 |
| commit | 3fade660b98c82f09a9838ddd13aa051e742d7fb (patch) | |
| tree | 68017fab766975cd9b0a06edc3493207200fcd53 | |
| parent | 9828be04a3f49d5b64eefe1dd17b33fde1ebfba2 (diff) | |
patches: refresh patches on v4.1-rc1v4.1-rc1-1
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 ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch | 12 |
1 files changed, 6 insertions, 6 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 22e8c2dd..7c505ce8 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,6 +1,6 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -2151,8 +2151,12 @@ static void btusb_intel_bootup(struct bt +@@ -1755,8 +1755,12 @@ static void btusb_intel_bootup(struct bt return; if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) { @@ -13,7 +13,7 @@ } } -@@ -2169,8 +2173,12 @@ static void btusb_intel_secure_send_resu +@@ -1773,8 +1777,12 @@ static void btusb_intel_secure_send_resu if (test_and_clear_bit(BTUSB_DOWNLOADING, &data->flags) && test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) { @@ -26,7 +26,7 @@ } } -@@ -2569,6 +2577,7 @@ static int btusb_setup_intel_new(struct +@@ -2173,6 +2181,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)); -@@ -2583,6 +2592,31 @@ static int btusb_setup_intel_new(struct +@@ -2187,6 +2196,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); -@@ -2622,6 +2656,7 @@ done: +@@ -2226,6 +2260,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)); -@@ -2635,6 +2670,33 @@ done: +@@ -2239,6 +2274,33 @@ done: BT_ERR("%s: Device boot timeout", hdev->name); return -ETIMEDOUT; } |