git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
bluetooth
/
bpa10x.c
diff --git
a/drivers/bluetooth/bpa10x.c
b/drivers/bluetooth/bpa10x.c
index c115285867c3010495b74da4b7eccfd910e518cb..d945cd12433a709c1c002533e418a2771988005d 100644
(file)
--- a/
drivers/bluetooth/bpa10x.c
+++ b/
drivers/bluetooth/bpa10x.c
@@
-469,7
+469,7
@@
static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
return -ENOMEM;
}
- hdev->
type
= HCI_USB;
+ hdev->
bus
= HCI_USB;
hdev->driver_data = data;
data->hdev = hdev;