diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 09:57:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 09:57:28 +0100 |
| commit | 46976c042ba1ff59253f2f7a513099175c24794e (patch) | |
| tree | a7af3f1c3ef2a2d430c49fb774ab744c296a2285 /drivers/bluetooth/bfusb.c | |
| parent | bridge: Make IGMP snooping depend upon BRIDGE. (diff) | |
| parent | Bluetooth: Fix out of scope variable access in hci_sock_cmsg() (diff) | |
| download | linux-46976c042ba1ff59253f2f7a513099175c24794e.tar.xz linux-46976c042ba1ff59253f2f7a513099175c24794e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'drivers/bluetooth/bfusb.c')
| -rw-r--r-- | drivers/bluetooth/bfusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 2a00707aba3b..005919ab043c 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c @@ -703,7 +703,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i data->hdev = hdev; - hdev->type = HCI_USB; + hdev->bus = HCI_USB; hdev->driver_data = data; SET_HCIDEV_DEV(hdev, &intf->dev); |