Commit 76ac740a authored by Champion Chen's avatar Champion Chen Committed by Greg Kroah-Hartman

Bluetooth: Fix issue with USB suspend in btusb driver

commit 85560c4a 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: default avatarChampion Chen <champion_chen@realsil.com.cn>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2730ca10
...@@ -317,6 +317,9 @@ static void btusb_intr_complete(struct urb *urb) ...@@ -317,6 +317,9 @@ static void btusb_intr_complete(struct urb *urb)
BT_ERR("%s corrupted event packet", hdev->name); BT_ERR("%s corrupted event packet", hdev->name);
hdev->stat.err_rx++; 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)) if (!test_bit(BTUSB_INTR_RUNNING, &data->flags))
...@@ -405,6 +408,9 @@ static void btusb_bulk_complete(struct urb *urb) ...@@ -405,6 +408,9 @@ static void btusb_bulk_complete(struct urb *urb)
BT_ERR("%s corrupted ACL packet", hdev->name); BT_ERR("%s corrupted ACL packet", hdev->name);
hdev->stat.err_rx++; 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)) if (!test_bit(BTUSB_BULK_RUNNING, &data->flags))
...@@ -499,6 +505,9 @@ static void btusb_isoc_complete(struct urb *urb) ...@@ -499,6 +505,9 @@ static void btusb_isoc_complete(struct urb *urb)
hdev->stat.err_rx++; 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)) if (!test_bit(BTUSB_ISOC_RUNNING, &data->flags))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment