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

Commit 53730107 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

parents 15be8e89 48439d50

drivers/bluetooth/ath3k.c

+0 −2
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0b05, 0x17d0) },

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3005) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x0CF3, 0x311E) },
@@ -140,7 +139,6 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ 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, 0x3005), .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 },

drivers/bluetooth/btusb.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static const struct usb_device_id blacklist_table[] = { 
	{ 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, 0x3005), .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 },

drivers/bluetooth/hci_h5.c

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ static int h5_rx_3wire_hdr(struct hci_uart *hu, unsigned char c) 
	    H5_HDR_PKT_TYPE(hdr) != HCI_3WIRE_LINK_PKT) {

		BT_ERR("Non-link packet received in non-active state");

		h5_reset_rx(h5);

		return 0;

	}



	h5->rx_func = h5_rx_payload;

drivers/net/wireless/b43/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ config B43_SSB 
choice

	prompt "Supported bus types"

	depends on B43

	default B43_BCMA_AND_SSB

	default B43_BUSES_BCMA_AND_SSB



config B43_BUSES_BCMA_AND_SSB

	bool "BCMA and SSB"

drivers/net/wireless/b43/main.c

+1 −0
Original line number Diff line number Diff line
@@ -5241,6 +5241,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) 
	/* We don't support 5 GHz on some PHYs yet */

	switch (dev->phy.type) {

	case B43_PHYTYPE_A:

	case B43_PHYTYPE_G:

	case B43_PHYTYPE_N:

	case B43_PHYTYPE_LP:

	case B43_PHYTYPE_HT: