Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[deliverable/linux.git] / drivers / bluetooth / hci_vhci.c

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index aba31210c802769206435fe2bd214991df449f02..3ff229b2e7f3746880a2db4deec9141d7d297a56 100644 (file)
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -97,10 +97,10 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode)
        if (data->hdev)
                return -EBADFD;
 
-       /* bits 0-1 are dev_type (BR/EDR or AMP) */
+       /* bits 0-1 are dev_type (Primary or AMP) */
        dev_type = opcode & 0x03;
 
-       if (dev_type != HCI_BREDR && dev_type != HCI_AMP)
+       if (dev_type != HCI_PRIMARY && dev_type != HCI_AMP)
                return -EINVAL;
 
        /* bits 2-5 are reserved (must be zero) */
@@ -316,7 +316,7 @@ static void vhci_open_timeout(struct work_struct *work)
        struct vhci_data *data = container_of(work, struct vhci_data,
                                              open_timeout.work);
 
-       vhci_create_device(data, amp ? HCI_AMP : HCI_BREDR);
+       vhci_create_device(data, amp ? HCI_AMP : HCI_PRIMARY);
 }
 
 static int vhci_open(struct inode *inode, struct file *file)