From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 21 Nov 2012 19:38:49 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.8-rc1~139^2~17^2~125
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e60896fe07307baa5f3ca1a220dfa9792657352;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
---

1e60896fe07307baa5f3ca1a220dfa9792657352
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index f21bf66,9f317b0..f6c21e7
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -2180,8 -1297,16 +1293,15 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
  	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
  
  	err = pci_enable_msi(pdev);
- 	if (err)
+ 	if (err) {
 -		dev_printk(KERN_ERR, &pdev->dev,
 -			   "pci_enable_msi failed(0X%x)\n", err);
 +		dev_err(&pdev->dev, "pci_enable_msi failed(0X%x)\n", err);
+ 		/* enable rfkill interrupt: hw bug w/a */
+ 		pci_read_config_word(pdev, PCI_COMMAND, &pci_cmd);
+ 		if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
+ 			pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
+ 			pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);
+ 		}
+ 	}
  
  	trans->dev = &pdev->dev;
  	trans_pcie->irq = pdev->irq;