mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
Bluetooth: Always set event mask on suspend
commitef61b6ea15
upstream. 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:182ee45da0
("Bluetooth: hci_sync: Rework hci_suspend_notifier") Cc: stable@vger.kernel.org Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3740a5da82
commit
d50f255704
1 changed files with 3 additions and 3 deletions
|
@ -4942,6 +4942,9 @@ int hci_suspend_sync(struct hci_dev *hdev)
|
||||||
return err;
|
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
|
/* Only configure accept list if disconnect succeeded and wake
|
||||||
* isn't being prevented.
|
* isn't being prevented.
|
||||||
*/
|
*/
|
||||||
|
@ -4953,9 +4956,6 @@ int hci_suspend_sync(struct hci_dev *hdev)
|
||||||
/* Unpause to take care of updating scanning params */
|
/* Unpause to take care of updating scanning params */
|
||||||
hdev->scanning_paused = false;
|
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 */
|
/* Enable event filter for paired devices */
|
||||||
hci_update_event_filter_sync(hdev);
|
hci_update_event_filter_sync(hdev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue