diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-29 23:03:20 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-29 23:03:20 +0400 |
| commit | 56e1bd770614da94f35e88c150cf9edf8d0b57a2 (patch) | |
| tree | 5a18f6e797e7d60b634fe0d229ae624625af073e /drivers/net/wireless/ti/wlcore/sdio.c | |
| parent | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (diff) | |
| parent | 5b37649bbcfc14c1ecfb76c5b018dd686924b946 (diff) | |
| download | linux-56e1bd770614da94f35e88c150cf9edf8d0b57a2.tar.xz | |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Conflicts:
drivers/net/wireless/ti/wlcore/main.c
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); } |