Commit 40842861 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: btusb: Fix not being able to reconnect after suspend 



This partially reverts 81b3e33bb054 ("Bluetooth: btusb: Don't fail
external suspend requests") as it introduced a call to hci_suspend_dev
that assumes the system-suspend which doesn't work well when just the
device is being suspended because wakeup flag is only set for remote
devices that can wakeup the system.

Reported-by: default avatarRafael J. Wysocki <rafael@kernel.org>
Reported-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reported-by: default avatarKenneth Crudup <kenny@panix.com>
Fixes: 61071229 ("Bluetooth: btusb: Don't fail external suspend requests")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Tested-by: default avatarRafael J. Wysocki <rafael@kernel.org>
parent 1db4564f

drivers/bluetooth/btusb.c

+0 −14
Original line number Diff line number Diff line
@@ -4038,7 +4038,6 @@ static void btusb_disconnect(struct usb_interface *intf) 
static int btusb_suspend(struct usb_interface *intf, pm_message_t message)

{

	struct btusb_data *data = usb_get_intfdata(intf);

	int err;



	BT_DBG("intf %p", intf);
@@ -4051,16 +4050,6 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) 
	if (data->suspend_count++)

		return 0;



	/* Notify Host stack to suspend; this has to be done before stopping

	 * the traffic since the hci_suspend_dev itself may generate some

	 * traffic.

	 */

	err = hci_suspend_dev(data->hdev);

	if (err) {

		data->suspend_count--;

		return err;

	}



	spin_lock_irq(&data->txlock);

	if (!(PMSG_IS_AUTO(message) && data->tx_in_flight)) {

		set_bit(BTUSB_SUSPENDING, &data->flags);
@@ -4068,7 +4057,6 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) 
	} else {

		spin_unlock_irq(&data->txlock);

		data->suspend_count--;

		hci_resume_dev(data->hdev);

		return -EBUSY;

	}
@@ -4189,8 +4177,6 @@ static int btusb_resume(struct usb_interface *intf) 
	spin_unlock_irq(&data->txlock);

	schedule_work(&data->work);



	hci_resume_dev(data->hdev);



	return 0;



failed: