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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

parents aa2ba5f1 9a5df923

drivers/bluetooth/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -2,26 +2,6 @@ 
menu "Bluetooth device drivers"

	depends on BT



config BT_HCIUSB

	tristate "HCI USB driver (old version)"

	depends on USB && BT_HCIBTUSB=n

	help

	  Bluetooth HCI USB driver.

	  This driver is required if you want to use Bluetooth devices with

	  USB interface.



	  Say Y here to compile support for Bluetooth USB devices into the

	  kernel or say M to compile it as module (hci_usb).



config BT_HCIUSB_SCO

	bool "SCO (voice) support"

	depends on BT_HCIUSB

	help

	  This option enables the SCO support in the HCI USB driver. You need this

	  to transmit voice data with your Bluetooth USB device.



	  Say Y here to compile support for SCO over HCI USB.



config BT_HCIBTUSB

	tristate "HCI USB driver"

	depends on USB

drivers/bluetooth/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# Makefile for the Linux Bluetooth HCI device drivers.

#



obj-$(CONFIG_BT_HCIUSB)		+= hci_usb.o

obj-$(CONFIG_BT_HCIVHCI)	+= hci_vhci.o

obj-$(CONFIG_BT_HCIUART)	+= hci_uart.o

obj-$(CONFIG_BT_HCIBCM203X)	+= bcm203x.o

drivers/bluetooth/bcm203x.c

+2 −7
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ 


#include <net/bluetooth/bluetooth.h>



#ifndef CONFIG_BT_HCIBCM203X_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#endif



#define VERSION "1.2"



static struct usb_device_id bcm203x_table[] = {
@@ -199,7 +194,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		return -EIO;

	}



	BT_DBG("minidrv data %p size %d", firmware->data, firmware->size);

	BT_DBG("minidrv data %p size %zu", firmware->data, firmware->size);



	size = max_t(uint, firmware->size, 4096);
@@ -227,7 +222,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		return -EIO;

	}



	BT_DBG("firmware data %p size %d", firmware->data, firmware->size);

	BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);



	data->fw_data = kmalloc(firmware->size, GFP_KERNEL);

	if (!data->fw_data) {

drivers/bluetooth/bfusb.c

+3 −8
Original line number Diff line number Diff line
@@ -38,11 +38,6 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#ifndef CONFIG_BT_HCIBFUSB_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#endif



#define VERSION "1.2"



static struct usb_driver bfusb_driver;
@@ -221,7 +216,7 @@ static int bfusb_rx_submit(struct bfusb_data *data, struct urb *urb) 
	struct sk_buff *skb;

	int err, pipe, size = HCI_MAX_FRAME_SIZE + 32;



	BT_DBG("bfusb %p urb %p", bfusb, urb);

	BT_DBG("bfusb %p urb %p", data, urb);



	if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC)))

		return -ENOMEM;
@@ -354,7 +349,7 @@ static void bfusb_rx_complete(struct urb *urb) 
	int count = urb->actual_length;

	int err, hdr, len;



	BT_DBG("bfusb %p urb %p skb %p len %d", bfusb, urb, skb, skb->len);

	BT_DBG("bfusb %p urb %p skb %p len %d", data, urb, skb, skb->len);



	read_lock(&data->lock);
@@ -691,7 +686,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
		goto error;

	}



	BT_DBG("firmware data %p size %d", firmware->data, firmware->size);

	BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);



	if (bfusb_load_firmware(data, firmware->data, firmware->size) < 0) {

		BT_ERR("Firmware loading failed");

drivers/bluetooth/bpa10x.c

+2 −5
Original line number Diff line number Diff line
@@ -35,11 +35,6 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#ifndef CONFIG_BT_HCIBPA10X_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#endif



#define VERSION "0.10"



static struct usb_device_id bpa10x_table[] = {
@@ -489,6 +484,8 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * 


	hdev->owner = THIS_MODULE;



	set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);



	err = hci_register_dev(hdev);

	if (err < 0) {

		hci_free_dev(hdev);