summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btmrvl_main.c
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2010-08-09 23:38:10 +0200
committerGustavo F. Padovan <padovan@profusion.mobi>2010-10-12 17:44:51 +0200
commit8f1e1742233cd1c3444dfc6c945a2efb2814e157 (patch)
tree252563ff2af556132d23f0edfd6bfa92a8a97dc5 /drivers/bluetooth/btmrvl_main.c
parentnet: percpu net_device refcount (diff)
downloadlinux-8f1e1742233cd1c3444dfc6c945a2efb2814e157.tar.xz
linux-8f1e1742233cd1c3444dfc6c945a2efb2814e157.zip
Bluetooth: HCI devices are either BR/EDR or AMP radios
HCI transport drivers may not know what type of radio an AMP device has so only say whether they're BR/EDR or AMP devices. Signed-off-by: David Vrabel <david.vrabel@csr.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'drivers/bluetooth/btmrvl_main.c')
-rw-r--r--drivers/bluetooth/btmrvl_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 0d32ec82e9bf..548d1d9e4dda 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -117,8 +117,8 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
(event->data[2] == MODULE_ALREADY_UP)) ?
"Bring-up succeed" : "Bring-up failed");
- if (event->length > 3)
- priv->btmrvl_dev.dev_type = event->data[3];
+ if (event->length > 3 && event->data[3])
+ priv->btmrvl_dev.dev_type = HCI_AMP;
else
priv->btmrvl_dev.dev_type = HCI_BREDR;