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

Commit 312fef7d authored by John W. Linville's avatar John W. Linville
Browse files

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

Conflicts:
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
parents 5e819059 2aeabcbe

drivers/bluetooth/ath3k.c

+11 −4
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <net/bluetooth/bluetooth.h>



#define VERSION "1.0"

#define ATH3K_FIRMWARE	"ath3k-1.fw"



#define ATH3K_DNLOAD				0x01

#define ATH3K_GETSTATE				0x05
@@ -400,9 +401,15 @@ static int ath3k_probe(struct usb_interface *intf, 
		return 0;

	}



	if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {

		BT_ERR("Error loading firmware");

		return -EIO;

	ret = request_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);

	if (ret < 0) {

		if (ret == -ENOENT)

			BT_ERR("Firmware file \"%s\" not found",

							ATH3K_FIRMWARE);

		else

			BT_ERR("Firmware file \"%s\" request failed (err=%d)",

							ATH3K_FIRMWARE, ret);

		return ret;

	}



	ret = ath3k_load_firmware(udev, firmware);
@@ -441,4 +448,4 @@ MODULE_AUTHOR("Atheros Communications"); 
MODULE_DESCRIPTION("Atheros AR30xx firmware driver");

MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL");

MODULE_FIRMWARE("ath3k-1.fw");
 
MODULE_FIRMWARE(ATH3K_FIRMWARE);

drivers/bluetooth/bfusb.c

+1 −3
Original line number Diff line number Diff line
@@ -751,9 +751,7 @@ static void bfusb_disconnect(struct usb_interface *intf) 


	bfusb_close(hdev);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);

}

drivers/bluetooth/bluecard_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -844,9 +844,7 @@ static int bluecard_close(bluecard_info_t *info) 
	/* Turn FPGA off */

	outb(0x80, iobase + 0x30);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);



	return 0;

drivers/bluetooth/bt3c_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -636,9 +636,7 @@ static int bt3c_close(bt3c_info_t *info) 


	bt3c_hci_close(hdev);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);



	return 0;

drivers/bluetooth/btuart_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -565,9 +565,7 @@ static int btuart_close(btuart_info_t *info) 


	spin_unlock_irqrestore(&(info->lock), flags);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);



	return 0;