Hi Johan,
On Tue, Feb 21, 2012 at 07:43:45PM +0200, johan.hedberg@xxxxxxxxx wrote:
> From: Johan Hedberg <johan.hedberg@xxxxxxxxx>
>
> When switching connectable mode off any pending discoverable timeout
> must also be disabled to avoid duplicate write_scan_enable commands.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
> ---
> net/bluetooth/mgmt.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
> index 6311be7..eec70a4 100644
> --- a/net/bluetooth/mgmt.c
> +++ b/net/bluetooth/mgmt.c
> @@ -935,9 +935,14 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
>
> if (cp->val)
> scan = SCAN_PAGE;
> - else
> + else {
I think here you have to use braces in both branches.
Best regards
Andrei Emeltchenko
> scan = 0;
>
> + if (test_bit(HCI_ISCAN, &hdev->flags) &&
> + hdev->discov_timeout > 0)
> + cancel_delayed_work(&hdev->discov_off);
> + }
> +
> err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
> if (err < 0)
> mgmt_pending_remove(cmd);
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
