| From 85560c4a828ec9c8573840c9b66487b6ae584768 Mon Sep 17 00:00:00 2001 |
| From: Champion Chen <champion_chen@realsil.com.cn> |
| Date: Sat, 6 Sep 2014 14:06:08 -0500 |
| Subject: Bluetooth: Fix issue with USB suspend in btusb driver |
| |
| From: Champion Chen <champion_chen@realsil.com.cn> |
| |
| commit 85560c4a828ec9c8573840c9b66487b6ae584768 upstream. |
| |
| Suspend could fail for some platforms because |
| btusb_suspend==> btusb_stop_traffic ==> usb_kill_anchored_urbs. |
| |
| When btusb_bulk_complete returns before system suspend and resubmits |
| an URB, the system cannot enter suspend state. |
| |
| Signed-off-by: Champion Chen <champion_chen@realsil.com.cn> |
| Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> |
| Signed-off-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/bluetooth/btusb.c | 9 +++++++++ |
| 1 file changed, 9 insertions(+) |
| |
| --- a/drivers/bluetooth/btusb.c |
| +++ b/drivers/bluetooth/btusb.c |
| @@ -330,6 +330,9 @@ static void btusb_intr_complete(struct u |
| BT_ERR("%s corrupted event packet", hdev->name); |
| hdev->stat.err_rx++; |
| } |
| + } else if (urb->status == -ENOENT) { |
| + /* Avoid suspend failed when usb_kill_urb */ |
| + return; |
| } |
| |
| if (!test_bit(BTUSB_INTR_RUNNING, &data->flags)) |
| @@ -418,6 +421,9 @@ static void btusb_bulk_complete(struct u |
| BT_ERR("%s corrupted ACL packet", hdev->name); |
| hdev->stat.err_rx++; |
| } |
| + } else if (urb->status == -ENOENT) { |
| + /* Avoid suspend failed when usb_kill_urb */ |
| + return; |
| } |
| |
| if (!test_bit(BTUSB_BULK_RUNNING, &data->flags)) |
| @@ -512,6 +518,9 @@ static void btusb_isoc_complete(struct u |
| hdev->stat.err_rx++; |
| } |
| } |
| + } else if (urb->status == -ENOENT) { |
| + /* Avoid suspend failed when usb_kill_urb */ |
| + return; |
| } |
| |
| if (!test_bit(BTUSB_ISOC_RUNNING, &data->flags)) |
