diff options
| author | Luciano Coelho <coelho@ti.com> | 2013-01-18 09:40:07 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2013-01-18 09:59:08 +0200 |
| commit | 5b37649bbcfc14c1ecfb76c5b018dd686924b946 (patch) | |
| tree | 5d88b1619176b860041fdd20b64ce917b8613698 /drivers/net/wireless/ti/wlcore/sdio.c | |
| parent | 660b9caaad380758c756a7e60397e33dab44fe3f (diff) | |
| parent | 2e07d02828759a506b5205b2cff40daa58df5bf7 (diff) | |
Merge branch 'wl12xx-next' into for-linville
Conflicts:
drivers/net/wireless/ti/wl12xx/main.c
drivers/net/wireless/ti/wlcore/wlcore.h
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/sdio.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/sdio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c index 646f703ae739..d4f184e2efed 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@ -326,8 +326,7 @@ static void wl1271_remove(struct sdio_func *func) /* Undo decrement done above in wl1271_probe */ pm_runtime_get_noresume(&func->dev); - platform_device_del(glue->core); - platform_device_put(glue->core); + platform_device_unregister(glue->core); kfree(glue); } |