Commit ef61b6ea authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: Always set event mask on suspend 



When suspending, always set the event mask once disconnects are
successful. Otherwise, if wakeup is disallowed, the event mask is not
set before suspend continues and can result in an early wakeup.

Fixes: 182ee45d ("Bluetooth: hci_sync: Rework hci_suspend_notifier")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 4b2f4e07

net/bluetooth/hci_sync.c

+3 −3
Original line number Diff line number Diff line
@@ -4973,6 +4973,9 @@ int hci_suspend_sync(struct hci_dev *hdev) 
		return err;

	}



	/* Update event mask so only the allowed event can wakeup the host */

	hci_set_event_mask_sync(hdev);



	/* Only configure accept list if disconnect succeeded and wake

	 * isn't being prevented.

	 */
@@ -4984,9 +4987,6 @@ int hci_suspend_sync(struct hci_dev *hdev) 
	/* Unpause to take care of updating scanning params */

	hdev->scanning_paused = false;



	/* Update event mask so only the allowed event can wakeup the host */

	hci_set_event_mask_sync(hdev);



	/* Enable event filter for paired devices */

	hci_update_event_filter_sync(hdev);