From: Kalle Valo <kvalo@codeaurora.org>
Date: Thu, 6 Aug 2015 07:27:59 +0000 (+0300)
Subject: Merge tag 'iwlwifi-next-for-kalle-2015-08-04' of https://git.kernel.org/pub/scm/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=052633c1ec042503cc78d678238714ea554a18e7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'iwlwifi-next-for-kalle-2015-08-04' of https://git./linux/kernel/git/iwlwifi/iwlwifi-next

* Deprecate -10.ucode
* Clean ups towards multiple Rx queues
* Add support for longer CMD IDs. This will be required by new
	firmwares since we are getting close to the u8 limit.
* bugfixes for the D0i3 power state
* Add basic support for FTM
* More random that doesn't really stand out
---

052633c1ec042503cc78d678238714ea554a18e7
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 6203c4ad9bba,cbc29ccc6a00..0549c91ad372
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -2472,10 -2564,11 +2564,11 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
  	spin_lock_init(&trans_pcie->irq_lock);
  	spin_lock_init(&trans_pcie->reg_lock);
  	spin_lock_init(&trans_pcie->ref_lock);
+ 	mutex_init(&trans_pcie->mutex);
  	init_waitqueue_head(&trans_pcie->ucode_write_waitq);
  
 -	err = pci_enable_device(pdev);
 -	if (err)
 +	ret = pci_enable_device(pdev);
 +	if (ret)
  		goto out_no_pci;
  
  	if (!cfg->base_params->pcie_l1_allowed) {