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

Commit cd5098d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

parents d8588ee5 576c7d85

drivers/bluetooth/bpa10x.c

+2 −5
Original line number Diff line number Diff line
@@ -367,10 +367,7 @@ static inline void bpa10x_free_urb(struct urb *urb) 
	if (!urb)

		return;



	if (urb->setup_packet)

	kfree(urb->setup_packet);



	if (urb->transfer_buffer)

	kfree(urb->transfer_buffer);



	usb_free_urb(urb);

drivers/bluetooth/hci_bcsp.c

+0 −2
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ 
#ifndef CONFIG_BT_HCIUART_DEBUG

#undef  BT_DBG

#define BT_DBG( A... )

#undef  BT_DMP

#define BT_DMP( A... )

#endif



static int hciextn = 1;

drivers/bluetooth/hci_h4.c

+0 −5
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ 
#ifndef CONFIG_BT_HCIUART_DEBUG

#undef  BT_DBG

#define BT_DBG( A... )

#undef  BT_DMP

#define BT_DMP( A... )

#endif



/* Initialize protocol */
@@ -125,7 +123,6 @@ static inline int h4_check_data_len(struct h4_struct *h4, int len) 


	BT_DBG("len %d room %d", len, room);

	if (!len) {

		BT_DMP(h4->rx_skb->data, h4->rx_skb->len);

		hci_recv_frame(h4->rx_skb);

	} else if (len > room) {

		BT_ERR("Data length is too large");
@@ -169,8 +166,6 @@ static int h4_recv(struct hci_uart *hu, void *data, int count) 
			case H4_W4_DATA:

				BT_DBG("Complete data");



				BT_DMP(h4->rx_skb->data, h4->rx_skb->len);



				hci_recv_frame(h4->rx_skb);



				h4->rx_state = H4_W4_PACKET_TYPE;

drivers/bluetooth/hci_ldisc.c

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ 
#ifndef CONFIG_BT_HCIUART_DEBUG

#undef  BT_DBG

#define BT_DBG( A... )

#undef  BT_DMP

#define BT_DMP( A... )

#endif



static int reset = 0;

drivers/bluetooth/hci_usb.c

+5 −6
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ 
#ifndef CONFIG_BT_HCIUSB_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#undef  BT_DMP

#define BT_DMP(D...)

#endif



#ifndef CONFIG_BT_HCIUSB_ZERO_PACKET
@@ -110,6 +108,9 @@ static struct usb_device_id blacklist_ids[] = { 
	/* Microsoft Wireless Transceiver for Bluetooth 2.0 */

	{ USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },



	/* Kensington Bluetooth USB adapter */

	{ USB_DEVICE(0x047d, 0x105d), .driver_info = HCI_RESET },



	/* ISSC Bluetooth Adapter v3.1 */

	{ USB_DEVICE(0x1131, 0x1001), .driver_info = HCI_RESET },
@@ -387,9 +388,7 @@ static void hci_usb_unlink_urbs(struct hci_usb *husb) 
			urb = &_urb->urb;

			BT_DBG("%s freeing _urb %p type %d urb %p",

					husb->hdev->name, _urb, _urb->type, urb);

			if (urb->setup_packet)

			kfree(urb->setup_packet);

			if (urb->transfer_buffer)

			kfree(urb->transfer_buffer);

			_urb_free(_urb);

		}