Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[pandora-kernel.git] / drivers / bluetooth / hci_vhci.c

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 7595274..3aa7b2a 100644 (file)
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -157,7 +157,7 @@ static inline ssize_t vhci_put_user(struct vhci_data *data,
                break;
 
        case HCI_SCODATA_PKT:
-               data->hdev->stat.cmd_tx++;
+               data->hdev->stat.sco_tx++;
                break;
        };
 
@@ -236,7 +236,7 @@ static int vhci_open(struct inode *inode, struct file *file)
 
        data->hdev = hdev;
 
-       hdev->type = HCI_VIRTUAL;
+       hdev->bus = HCI_VIRTUAL;
        hdev->driver_data = data;
 
        hdev->open     = vhci_open_dev;