DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Send power off notification earlier in the device close process" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2011-12-23 02:36:17 -08:00
committed by QuIC Gerrit Code Review
parent 8eeba631f9 ffdff571cb
commit 510503d38e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/bluetooth/hci_core.c
View File

@@ -639,6 +639,12 @@ static int hci_dev_do_close(struct hci_dev *hdev)
hci_notify(hdev, HCI_DEV_DOWN); hci_notify(hdev, HCI_DEV_DOWN);
if (hdev->dev_type == HCI_BREDR) {
hci_dev_lock_bh(hdev);
mgmt_powered(hdev->id, 0);
hci_dev_unlock_bh(hdev);
}
if (hdev->flush) if (hdev->flush)
hdev->flush(hdev); hdev->flush(hdev);
@@ -671,12 +677,6 @@ static int hci_dev_do_close(struct hci_dev *hdev)
* and no tasks are scheduled. */ * and no tasks are scheduled. */
hdev->close(hdev); hdev->close(hdev);
if (hdev->dev_type == HCI_BREDR) {
hci_dev_lock_bh(hdev);
mgmt_powered(hdev->id, 0);
hci_dev_unlock_bh(hdev);
}
/* Clear only non-persistent flags */ /* Clear only non-persistent flags */
if (test_bit(HCI_MGMT, &hdev->flags)) if (test_bit(HCI_MGMT, &hdev->flags))
set_bit(HCI_MGMT, &keepflags); set_bit(HCI_MGMT, &keepflags);