projects
/
firefly-linux-kernel-4.4.55.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...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
bluetooth
/
btsdio.c
diff --git
a/drivers/bluetooth/btsdio.c
b/drivers/bluetooth/btsdio.c
index 7e298275c8f663b45fc04f57e5499c9f372b62d5..76e5127884f05bc948c3a6d2b306a07483dbd033 100644
(file)
--- a/
drivers/bluetooth/btsdio.c
+++ b/
drivers/bluetooth/btsdio.c
@@
-326,7
+326,7
@@
static int btsdio_probe(struct sdio_func *func,
return -ENOMEM;
}
- hdev->
type
= HCI_SDIO;
+ hdev->
bus
= HCI_SDIO;
hdev->driver_data = data;
data->hdev = hdev;