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

Commit 43c2e57f authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Submit bulk URBs along with interrupt URBs 



Submitting the bulk URBs for ACL data transfers only on demand has no
real benefit compared to just submit them when a Bluetooth device gets
opened. So when submitting the interrupt URBs for HCI events, just
submit the bulk URBs, too.

This solves a problem with some Bluetooth USB dongles that has been
reported over the last few month. These devices require that the bulk
URBs are actually present. These devices are really broken, but there
is nothing we can do about it.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 6e1031a4

drivers/bluetooth/btusb.c

+23 −17
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>

#include <net/bluetooth/hci_core.h>





#define VERSION "0.4"

#define VERSION "0.5"





static int ignore_dga;

static int ignore_dga;

static int ignore_csr;

static int ignore_csr;
@@ -171,6 +171,7 @@ struct btusb_data { 




	__u8 cmdreq_type;

	__u8 cmdreq_type;





	unsigned int sco_num;

	int isoc_altsetting;

	int isoc_altsetting;

	int suspend_count;

	int suspend_count;

};

};
@@ -496,11 +497,23 @@ static int btusb_open(struct hci_dev *hdev) 
		return 0;

		return 0;





	err = btusb_submit_intr_urb(hdev, GFP_KERNEL);

	err = btusb_submit_intr_urb(hdev, GFP_KERNEL);

	if (err < 0)

		goto failed;



	err = btusb_submit_bulk_urb(hdev, GFP_KERNEL);

	if (err < 0) {

	if (err < 0) {

		clear_bit(BTUSB_INTR_RUNNING, &data->flags);

		usb_kill_anchored_urbs(&data->intr_anchor);

		clear_bit(HCI_RUNNING, &hdev->flags);

		goto failed;

	}

	}





	set_bit(BTUSB_BULK_RUNNING, &data->flags);

	btusb_submit_bulk_urb(hdev, GFP_KERNEL);



	return 0;



failed:

	clear_bit(BTUSB_INTR_RUNNING, &data->flags);

	clear_bit(HCI_RUNNING, &hdev->flags);

	return err;

	return err;

}

}
@@ -655,20 +668,11 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt) 




	BT_DBG("%s evt %d", hdev->name, evt);

	BT_DBG("%s evt %d", hdev->name, evt);





	if (hdev->conn_hash.acl_num > 0) {

	if (hdev->conn_hash.sco_num != data->sco_num) {

		if (!test_and_set_bit(BTUSB_BULK_RUNNING, &data->flags)) {

		data->sco_num = hdev->conn_hash.sco_num;

			if (btusb_submit_bulk_urb(hdev, GFP_ATOMIC) < 0)

				clear_bit(BTUSB_BULK_RUNNING, &data->flags);

			else

				btusb_submit_bulk_urb(hdev, GFP_ATOMIC);

		}

	} else {

		clear_bit(BTUSB_BULK_RUNNING, &data->flags);

		usb_unlink_anchored_urbs(&data->bulk_anchor);

	}



		schedule_work(&data->work);

		schedule_work(&data->work);

	}

	}

}





static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting)

static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting)

{

{
@@ -982,9 +986,11 @@ static int btusb_resume(struct usb_interface *intf) 
	}

	}





	if (test_bit(BTUSB_BULK_RUNNING, &data->flags)) {

	if (test_bit(BTUSB_BULK_RUNNING, &data->flags)) {

		if (btusb_submit_bulk_urb(hdev, GFP_NOIO) < 0)

		err = btusb_submit_bulk_urb(hdev, GFP_NOIO);

		if (err < 0) {

			clear_bit(BTUSB_BULK_RUNNING, &data->flags);

			clear_bit(BTUSB_BULK_RUNNING, &data->flags);

		else

			return err;

		} else

			btusb_submit_bulk_urb(hdev, GFP_NOIO);

			btusb_submit_bulk_urb(hdev, GFP_NOIO);

	}

	}