diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-08-01 08:59:31 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-08-01 08:59:31 -0300 |
| commit | 18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a (patch) | |
| tree | 4c1732a2dddb246f0d39a492cbf8e6db31f3af3e /net/bluetooth/hci_sync.c | |
| parent | perf stat: Add topdown metrics in the default perf stat on the hybrid machine (diff) | |
| parent | Linux 5.19 (diff) | |
| download | linux-dev-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.tar.xz linux-dev-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes that went upstream via acme/perf/urgent and to get
to v5.19.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/bluetooth/hci_sync.c')
| -rw-r--r-- | net/bluetooth/hci_sync.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 1739e8cb3291..c17021642234 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -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); |