diff options
| author | David S. Miller | 2016-10-23 23:51:38 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-10-23 23:51:38 +0200 |
| commit | 44060abe1dd609d5efa641cce3784777ff5d507f (patch) | |
| tree | b0419419c7c7dbdd95f73a256fa7ca7eb0fce9d6 /drivers | |
| parent | net: sctp, forbid negative length (diff) | |
| parent | Bluetooth: btwilink: Fix probe return value (diff) | |
| download | kernel-qcow2-linux-44060abe1dd609d5efa641cce3784777ff5d507f.tar.gz kernel-qcow2-linux-44060abe1dd609d5efa641cce3784777ff5d507f.tar.xz kernel-qcow2-linux-44060abe1dd609d5efa641cce3784777ff5d507f.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2016-10-21
Here are some more Bluetooth fixes for the 4.9 kernel:
- Fix to btwilink driver probe function return value
- Power management fix to hci_bcm
- Fix to encoding name in scan response data
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/btwilink.c | 2 | ||||
| -rw-r--r-- | drivers/bluetooth/hci_bcm.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c index ef51c9c864c5..b6bb58c41df5 100644 --- a/drivers/bluetooth/btwilink.c +++ b/drivers/bluetooth/btwilink.c @@ -310,7 +310,7 @@ static int bt_ti_probe(struct platform_device *pdev) BT_DBG("HCI device registered (hdev %p)", hdev); dev_set_drvdata(&pdev->dev, hst); - return err; + return 0; } static int bt_ti_remove(struct platform_device *pdev) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 5ccb90ef0146..8f6c23c20c52 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -643,6 +643,14 @@ static const struct dmi_system_id bcm_wrong_irq_dmi_table[] = { }, .driver_data = &acpi_active_low, }, + { /* Handle ThinkPad 8 tablets with BCM2E55 chipset ACPI ID */ + .ident = "Lenovo ThinkPad 8", + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "ThinkPad 8"), + }, + .driver_data = &acpi_active_low, + }, { } }; |