diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-31 17:22:45 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-31 17:22:45 (GMT) |
| commit | 7b22a7788b0263f42f7232c5c05c503424ffa0ba (patch) | |
| tree | e6460f2340320ad4194764183ca601e8371096cc /drivers | |
| parent | ccac0425655918fccd0ffec47b2788cb1ac62d7b (diff) | |
| parent | 7ddb69222d0fdc0bc83b60dbb21d9864ebf2907e (diff) | |
| download | linux-7b22a7788b0263f42f7232c5c05c503424ffa0ba.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-12-31
Here's (probably) the last bluetooth-next pull request for the 4.5
kernel:
- Add support for BCM2E65 ACPI ID
- Minor fixes/cleanups in the bcm203x & bfusb drivers
- Minor debugfs related fix in 6lowpan code
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/bcm203x.c | 4 | ||||
| -rw-r--r-- | drivers/bluetooth/bfusb.c | 6 | ||||
| -rw-r--r-- | drivers/bluetooth/hci_bcm.c | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c index 364f82b..5b0ef7b 100644 --- a/drivers/bluetooth/bcm203x.c +++ b/drivers/bluetooth/bcm203x.c @@ -178,10 +178,8 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id return -ENODEV; data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL); - if (!data) { - BT_ERR("Can't allocate memory for data structure"); + if (!data) return -ENOMEM; - } data->udev = udev; data->state = BCM203X_LOAD_MINIDRV; diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 72d8bfa..3bf4ec6 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c @@ -636,10 +636,8 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i /* Initialize control structure and load firmware */ data = devm_kzalloc(&intf->dev, sizeof(struct bfusb_data), GFP_KERNEL); - if (!data) { - BT_ERR("Can't allocate memory for control structure"); - goto done; - } + if (!data) + return -ENOMEM; data->udev = udev; data->bulk_in_ep = bulk_in_ep->desc.bEndpointAddress; diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 3eed35e..5c7c696 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -815,6 +815,7 @@ static const struct hci_uart_proto bcm_proto = { #ifdef CONFIG_ACPI static const struct acpi_device_id bcm_acpi_match[] = { { "BCM2E39", 0 }, + { "BCM2E65", 0 }, { "BCM2E67", 0 }, { }, }; |