---

yaml --- r: 215042 b: refs/heads/master c: 4e23b11 h: refs/heads/master v: v3
git-mirror · Sep 28, 2010 · dc6df89 · dc6df89
1 parent 8f77171
commit dc6df89
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;