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

Commit 46976c04 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 024c378f f6e623a6

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ static int ath3k_probe(struct usb_interface *intf, 
	usb_set_intfdata(intf, data);

	if (ath3k_load_firmware(data, data->fw_data, data->fw_size)) {

		usb_set_intfdata(intf, NULL);

		kfree(data->fw_data);

		kfree(data);

		return -EIO;

	}

drivers/bluetooth/bcm203x.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#define VERSION "1.2"



static struct usb_device_id bcm203x_table[] = {

static const struct usb_device_id bcm203x_table[] = {

	/* Broadcom Blutonium (BCM2033) */

	{ USB_DEVICE(0x0a5c, 0x2033) },

drivers/bluetooth/bfusb.c

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 


	data->hdev = hdev;



	hdev->type = HCI_USB;

	hdev->bus = HCI_USB;

	hdev->driver_data = data;

	SET_HCIDEV_DEV(hdev, &intf->dev);

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static int bluecard_open(bluecard_info_t *info) 


	info->hdev = hdev;



	hdev->type = HCI_PCCARD;

	hdev->bus = HCI_PCCARD;

	hdev->driver_data = info;

	SET_HCIDEV_DEV(hdev, &info->p_dev->dev);

drivers/bluetooth/bpa10x.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * 
		return -ENOMEM;

	}



	hdev->type = HCI_USB;

	hdev->bus = HCI_USB;

	hdev->driver_data = data;



	data->hdev = hdev;