From dc6df898c9016ccd41debc49214046e4f87df118 Mon Sep 17 00:00:00 2001
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Fri, 13 Aug 2010 04:46:48 +0200
Subject: [PATCH] --- yaml --- r: 215042 b: refs/heads/master c:
 4e23b11b08ed116664cce6114546d5a96eb94e8b h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c | 3 +--
 trunk/drivers/net/wireless/wl12xx/wl1271_spi.c  | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 776a2000ba89..a1bd0b3db7a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 165530974504e21d79a43e5f964bd9284e45a8f1
+refs/heads/master: 4e23b11b08ed116664cce6114546d5a96eb94e8b
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
index f2f04663627c..4c250d7dc3fa 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -274,9 +274,8 @@ static void __devexit wl1271_remove(struct sdio_func *func)
 {
 	struct wl1271 *wl = sdio_get_drvdata(func);
 
-	free_irq(wl->irq, wl);
-
 	wl1271_unregister_hw(wl);
+	free_irq(wl->irq, wl);
 	wl1271_free_hw(wl);
 }
 
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_spi.c b/trunk/drivers/net/wireless/wl12xx/wl1271_spi.c
index ced0a9e2c7e1..75cbf36146e2 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_spi.c
@@ -416,9 +416,8 @@ static int __devexit wl1271_remove(struct spi_device *spi)
 {
 	struct wl1271 *wl = dev_get_drvdata(&spi->dev);
 
-	free_irq(wl->irq, wl);
-
 	wl1271_unregister_hw(wl);
+	free_irq(wl->irq, wl);
 	wl1271_free_hw(wl);
 
 	return 0;