aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-21 15:24:59 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-27 13:27:05 -0400
commitdf1c2986c4685776ed02802c170c7fb6f47d8218 (patch)
treecef7d77b4d901ecc30ad2734d5110c303080bd49 /drivers
parent903786a5626e7214d97b232bece88ee75e37d021 (diff)
ath5k: re-order one of the frees on unwind
There was a small misordering here. In the original code, if we were to go to err_free_ah then it wouldn't free the irq. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath5k/base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index f2fceb10c9fc..45789c8990d3 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -700,10 +700,10 @@ ath5k_pci_probe(struct pci_dev *pdev,
700 return 0; 700 return 0;
701err_ah: 701err_ah:
702 ath5k_hw_detach(sc->ah); 702 ath5k_hw_detach(sc->ah);
703err_irq:
704 free_irq(pdev->irq, sc);
705err_free_ah: 703err_free_ah:
706 kfree(sc->ah); 704 kfree(sc->ah);
705err_irq:
706 free_irq(pdev->irq, sc);
707err_free: 707err_free:
708 ieee80211_free_hw(hw); 708 ieee80211_free_hw(hw);
709err_map: 709err_map: