Commit 35b973c9 authored Mar 15, 2013 by Johan Hedberg Committed by Gustavo Padovan Mar 18, 2013

Bluetooth: Fix clearing flags on power off before notifying mgmt

When powering off the device the hdev->flags and hdev->dev_flags need to
be cleared before calling mgmt_powered(). If this is not done the
resulting events sent to user space may contain incorrect values.

Note that the HCI_AUTO_OFF flag accessed right after this is part of the
persistent flags, so it's unchanged by the hdev->dev_flags reset.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent f9f85279

net/bluetooth/hci_core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1130,6 +1130,10 @@ static int hci_dev_do_close(struct hci_dev *hdev)
		* and no tasks are scheduled. */
		hdev->close(hdev);

		/* Clear flags */
		hdev->flags = 0;
		hdev->dev_flags &= ~HCI_PERSISTENT_MASK;

		if (!test_and_clear_bit(HCI_AUTO_OFF, &hdev->dev_flags) &&
		mgmt_valid_hdev(hdev)) {
		hci_dev_lock(hdev);
		@@ -1137,10 +1141,6 @@ static int hci_dev_do_close(struct hci_dev *hdev)
		hci_dev_unlock(hdev);
		}

		/* Clear flags */
		hdev->flags = 0;
		hdev->dev_flags &= ~HCI_PERSISTENT_MASK;

		/* Controller radio is available but is currently powered down */
		hdev->amp_status = 0;