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

Commit 5e13441c authored by Frederic Danis's avatar Frederic Danis Committed by Marcel Holtmann
Browse files

Bluetooth: btusb: Fix calls to __hci_cmd_sync() 



Remove test of command reply status as it is already performed by
__hci_cmd_sync().

__hci_cmd_sync_ev() function already returns an error if it got a
non-zero status either through a Command Complete or a Command
Status event.

For both of these events the status is collected up in the event
handlers called by hci_event_packet() and then passed as the second
parameter to req_complete_skb(). The req_complete_skb() callback in
turn is hci_req_sync_complete() for __hci_cmd_sync_ev() which stores
the status in hdev->req_result. The hdev->req_result is then further
converted through bt_to_errno() back in __hci_cmd_sync_ev().

Signed-off-by: default avatarFrederic Danis <frederic.danis@linux.intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent cffd2eed

drivers/bluetooth/btusb.c

+0 −36
Original line number Diff line number Diff line
@@ -1577,12 +1577,6 @@ static int btusb_setup_intel(struct hci_dev *hdev) 
	}



	ver = (struct intel_version *)skb->data;

	if (ver->status) {

		BT_ERR("%s Intel fw version event failed (%02x)", hdev->name,

		       ver->status);

		kfree_skb(skb);

		return -bt_to_errno(ver->status);

	}



	BT_INFO("%s: read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",

		hdev->name, ver->hw_platform, ver->hw_variant,
@@ -1630,15 +1624,6 @@ static int btusb_setup_intel(struct hci_dev *hdev) 
		return PTR_ERR(skb);

	}



	if (skb->data[0]) {

		u8 evt_status = skb->data[0];



		BT_ERR("%s enable Intel manufacturer mode event failed (%02x)",

		       hdev->name, evt_status);

		kfree_skb(skb);

		release_firmware(fw);

		return -bt_to_errno(evt_status);

	}

	kfree_skb(skb);



	disable_patch = 1;
@@ -1984,13 +1969,6 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	}



	ver = (struct intel_version *)skb->data;

	if (ver->status) {

		BT_ERR("%s: Intel version command failure (%02x)",

		       hdev->name, ver->status);

		err = -bt_to_errno(ver->status);

		kfree_skb(skb);

		return err;

	}



	/* The hardware platform number has a fixed value of 0x37 and

	 * for now only accept this single value.
@@ -2065,13 +2043,6 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	}



	params = (struct intel_boot_params *)skb->data;

	if (params->status) {

		BT_ERR("%s: Intel boot parameters command failure (%02x)",

		       hdev->name, params->status);

		err = -bt_to_errno(params->status);

		kfree_skb(skb);

		return err;

	}



	BT_INFO("%s: Device revision is %u", hdev->name,

		le16_to_cpu(params->dev_revid));
@@ -2304,13 +2275,6 @@ static void btusb_hw_error_intel(struct hci_dev *hdev, u8 code) 
		return;

	}



	if (skb->data[0] != 0x00) {

		BT_ERR("%s: Exception info command failure (%02x)",

		       hdev->name, skb->data[0]);

		kfree_skb(skb);

		return;

	}



	BT_ERR("%s: Exception info %s", hdev->name, (char *)(skb->data + 1));



	kfree_skb(skb);