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

Commit d819c6cf authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: pcie: fix merge damage 



The merge b35c8097 seems to have lost commit eabc4ac5,
put the code back.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 772eb433

drivers/net/wireless/iwlwifi/pcie/trans.c

+4 −4
Original line number Diff line number Diff line
@@ -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));