From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 11 Dec 2012 21:03:03 +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~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ecbbec2eb093d2ef205de371af986f0360fca539;p=platform%2Fkernel%2Flinux-3.10.git

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

ecbbec2eb093d2ef205de371af986f0360fca539
diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
index 2b7e8a0,a93a170..c2e141a
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@@ -290,10 -295,10 +295,10 @@@ out_free_drv
  out_free_trans:
  	iwl_trans_pcie_free(iwl_trans);
  	pci_set_drvdata(pdev, NULL);
- 	return -EFAULT;
+ 	return ret;
  }
  
 -static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 +static void iwl_pci_remove(struct pci_dev *pdev)
  {
  	struct iwl_trans *trans = pci_get_drvdata(pdev);
  	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);