Merge remote-tracking branch 'xen-tip/linux-next'

[deliverable/linux.git] / drivers / net / wireless / marvell / mwifiex / sdio.c

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index d3e1561ca07508e5d35b71388a89dd40a5286622..6dba40998a6676a979e7666dd3489c61de4bfd3a 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -289,7 +289,7 @@ mwifiex_sdio_remove(struct sdio_func *func)
 
        mwifiex_dbg(adapter, INFO, "info: SDIO func num=%d\n", func->num);
 
-       if (user_rmmod) {
+       if (user_rmmod && !adapter->mfg_mode) {
                if (adapter->is_suspended)
                        mwifiex_sdio_resume(adapter->dev);