From e095ae09310faebf0926399616bcb46a79f0c88b Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Fri, 11 Nov 2011 17:02:15 +0200 Subject: [PATCH] --- yaml --- r: 278576 b: refs/heads/master c: 07e3b94ac385cc9d5fd31d6dcd233da0958b9984 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_core.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fbcd42d31c19..fefd09f6cde5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8830f514106fbd09ba5bbbaae043a8624ceb9d67 +refs/heads/master: 07e3b94ac385cc9d5fd31d6dcd233da0958b9984 diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c index fb3feeb185d7..cf18f6d1b9a3 100644 --- a/trunk/net/bluetooth/hci_core.c +++ b/trunk/net/bluetooth/hci_core.c @@ -521,8 +521,9 @@ int hci_dev_open(__u16 dev) if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks)) set_bit(HCI_RAW, &hdev->flags); - /* Treat all non BR/EDR controllers as raw devices for now */ - if (hdev->dev_type != HCI_BREDR) + /* Treat all non BR/EDR controllers as raw devices if + enable_hs is not set */ + if (hdev->dev_type != HCI_BREDR && !enable_hs) set_bit(HCI_RAW, &hdev->flags); if (hdev->open(hdev)) {