diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-08 15:39:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-08 15:39:28 -0400 |
| commit | e9a68707d736f4f73d7e209885d7b4c5c452b1dc (patch) | |
| tree | d9f76964c77c1059483b08436ed060b702b8e25d /drivers/net/wireless/wl12xx/wl1271_sdio.c | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 15a6321d1c0f8db561932cd99e1b9897981da71f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ipw2x00/ipw2200.c
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_sdio.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_sdio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c index f2f04663627c..4c250d7dc3fa 100644 --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c | |||
| @@ -274,9 +274,8 @@ static void __devexit wl1271_remove(struct sdio_func *func) | |||
| 274 | { | 274 | { |
| 275 | struct wl1271 *wl = sdio_get_drvdata(func); | 275 | struct wl1271 *wl = sdio_get_drvdata(func); |
| 276 | 276 | ||
| 277 | free_irq(wl->irq, wl); | ||
| 278 | |||
| 279 | wl1271_unregister_hw(wl); | 277 | wl1271_unregister_hw(wl); |
| 278 | free_irq(wl->irq, wl); | ||
| 280 | wl1271_free_hw(wl); | 279 | wl1271_free_hw(wl); |
| 281 | } | 280 | } |
| 282 | 281 | ||