projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
36b07d1
25a1726
)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
author
John W. Linville
<linville@tuxdriver.com>
Tue, 11 Dec 2012 21:03:03 +0000
(16:03 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 11 Dec 2012 21:03:03 +0000
(16:03 -0500)
1
2
drivers/net/wireless/iwlwifi/dvm/dev.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/dvm/devices.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/dvm/mac80211.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/dvm/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/dvm/rxon.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/rx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/trans.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/iwlwifi/dvm/dev.h
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/dvm/devices.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/dvm/main.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/dvm/rxon.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/pcie/drv.c
index
2b7e8a0
,
a93a170
..
c2e141a
---
1
/
drivers/net/wireless/iwlwifi/pcie/drv.c
---
2
/
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);
diff --cc
drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge