diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-03 21:27:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-03 21:27:55 -0700 |
| commit | 45865dabb14cee3be334c1376d69e959a62af561 (patch) | |
| tree | 8393f518846dd2470aa28b24e6c54c90f6104bd6 /net/bluetooth/hci_sysfs.c | |
| parent | f98ce38927d53e84960fbc5f7789d5ad6126b076 (diff) | |
| parent | 65bce46298d064dff9db1282e17bb26602715819 (diff) | |
| download | linux-45865dabb14cee3be334c1376d69e959a62af561.tar.bz2 | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-09-03
Here's one last bluetooth-next pull request for the 4.14 kernel:
- NULL pointer fix in ca8210 802.15.4 driver
- A few "const" fixes
- New Kconfig option for disabling legacy interfaces
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_sysfs.c')
| -rw-r--r-- | net/bluetooth/hci_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index ca7a35ebaefb..aa300f3a0d51 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -13,7 +13,7 @@ static void bt_link_release(struct device *dev) kfree(conn); } -static struct device_type bt_link = { +static const struct device_type bt_link = { .name = "link", .release = bt_link_release, }; @@ -86,7 +86,7 @@ static void bt_host_release(struct device *dev) module_put(THIS_MODULE); } -static struct device_type bt_host = { +static const struct device_type bt_host = { .name = "host", .release = bt_host_release, }; |