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

Commit 1d8af8ca authored by Sujith.Manoharan@atheros.com's avatar Sujith.Manoharan@atheros.com Committed by John W. Linville
Browse files

ath9k_htc: Allocate URBs properly 



The URBs have to be allocated before uploading
the firmware to the target. This is needed to process
the target ready message properly.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 05a30f9c

drivers/net/wireless/ath/ath9k/hif_usb.c

+18 −18
Original line number Diff line number Diff line
@@ -735,6 +735,14 @@ static int ath9k_hif_usb_alloc_urbs(struct hif_device_usb *hif_dev) 
	return -ENOMEM;

}



static void ath9k_hif_usb_dealloc_urbs(struct hif_device_usb *hif_dev)

{

	usb_kill_anchored_urbs(&hif_dev->regout_submitted);

	ath9k_hif_usb_dealloc_reg_in_urb(hif_dev);

	ath9k_hif_usb_dealloc_tx_urbs(hif_dev);

	ath9k_hif_usb_dealloc_rx_urbs(hif_dev);

}



static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)

{

	int transfer, err;
@@ -794,14 +802,6 @@ static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev, 
		goto err_fw_req;

	}



	/* Download firmware */

	ret = ath9k_hif_usb_download_fw(hif_dev);

	if (ret) {

		dev_err(&hif_dev->udev->dev,

			"ath9k_htc: Firmware - %s download failed\n", fw_name);

		goto err_fw_download;

	}



	/* Alloc URBs */

	ret = ath9k_hif_usb_alloc_urbs(hif_dev);

	if (ret) {
@@ -810,25 +810,25 @@ static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev, 
		goto err_urb;

	}



	/* Download firmware */

	ret = ath9k_hif_usb_download_fw(hif_dev);

	if (ret) {

		dev_err(&hif_dev->udev->dev,

			"ath9k_htc: Firmware - %s download failed\n", fw_name);

		goto err_fw_download;

	}



	return 0;



err_urb:

	/* Nothing */

err_fw_download:

	ath9k_hif_usb_dealloc_urbs(hif_dev);

err_urb:

	release_firmware(hif_dev->firmware);

err_fw_req:

	hif_dev->firmware = NULL;

	return ret;

}



static void ath9k_hif_usb_dealloc_urbs(struct hif_device_usb *hif_dev)

{

	usb_kill_anchored_urbs(&hif_dev->regout_submitted);

	ath9k_hif_usb_dealloc_reg_in_urb(hif_dev);

	ath9k_hif_usb_dealloc_tx_urbs(hif_dev);

	ath9k_hif_usb_dealloc_rx_urbs(hif_dev);

}



static void ath9k_hif_usb_dev_deinit(struct hif_device_usb *hif_dev)

{

	ath9k_hif_usb_dealloc_urbs(hif_dev);