diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-09-30 11:02:46 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-07 13:34:43 -0400 |
| commit | d107babca27f3c08e399616483e4c5f010bd24d3 (patch) | |
| tree | 359f12f44cf8cda7c5fb28f5561130403baf88f1 /drivers/net | |
| parent | ec30326ea773900da210c495e14cfeb532550ba2 (diff) | |
| download | kernel_goldelico_gta04-d107babca27f3c08e399616483e4c5f010bd24d3.zip kernel_goldelico_gta04-d107babca27f3c08e399616483e4c5f010bd24d3.tar.gz kernel_goldelico_gta04-d107babca27f3c08e399616483e4c5f010bd24d3.tar.bz2 | |
iwlwifi: pcie: fix merge damage
The merge b35c8097 seems to have lost commit eabc4ac5d,
put the code back.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/trans.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index bad95d2..c3f904d 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -1401,6 +1401,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, spin_lock_init(&trans_pcie->reg_lock); init_waitqueue_head(&trans_pcie->ucode_write_waitq); + err = pci_enable_device(pdev); + if (err) + goto out_no_pci; + if (!cfg->base_params->pcie_l1_allowed) { /* * W/A - seems to solve weird behavior. We need to remove this @@ -1412,10 +1416,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, PCIE_LINK_STATE_CLKPM); } - err = pci_enable_device(pdev); - if (err) - goto out_no_pci; - pci_set_master(pdev); err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36)); |