Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5dd0e79 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 



Johan Hedberg says:

====================
Here are a few more important Bluetooth driver fixes for the 4.16
kernel.

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 36fe0956 e07c99b0

drivers/bluetooth/btusb.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },
@@ -264,6 +263,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },



	/* QCA ROME chipset */

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_QCA_ROME },

	{ USB_DEVICE(0x0cf3, 0xe007), .driver_info = BTUSB_QCA_ROME },

	{ USB_DEVICE(0x0cf3, 0xe009), .driver_info = BTUSB_QCA_ROME },

	{ USB_DEVICE(0x0cf3, 0xe010), .driver_info = BTUSB_QCA_ROME },

drivers/bluetooth/hci_bcm.c

+9 −4
Original line number Diff line number Diff line
@@ -244,7 +244,9 @@ static irqreturn_t bcm_host_wake(int irq, void *data) 


	bt_dev_dbg(bdev, "Host wake IRQ");



	pm_request_resume(bdev->dev);

	pm_runtime_get(bdev->dev);

	pm_runtime_mark_last_busy(bdev->dev);

	pm_runtime_put_autosuspend(bdev->dev);



	return IRQ_HANDLED;

}
@@ -301,7 +303,7 @@ static const struct bcm_set_sleep_mode default_sleep_params = { 
	.usb_auto_sleep = 0,

	.usb_resume_timeout = 0,

	.break_to_host = 0,

	.pulsed_host_wake = 0,

	.pulsed_host_wake = 1,

};



static int bcm_setup_sleep(struct hci_uart *hu)
@@ -586,8 +588,11 @@ static int bcm_recv(struct hci_uart *hu, const void *data, int count) 
	} else if (!bcm->rx_skb) {

		/* Delay auto-suspend when receiving completed packet */

		mutex_lock(&bcm_device_lock);

		if (bcm->dev && bcm_device_exists(bcm->dev))

			pm_request_resume(bcm->dev->dev);

		if (bcm->dev && bcm_device_exists(bcm->dev)) {

			pm_runtime_get(bcm->dev->dev);

			pm_runtime_mark_last_busy(bcm->dev->dev);

			pm_runtime_put_autosuspend(bcm->dev->dev);

		}

		mutex_unlock(&bcm_device_lock);

	}