Merge remote-tracking branch 'md/for-next'

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

diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
index 3bd04f52f3698892d929599890cebb11463abb82..92135167a8220df377875b61cda4ebab725ae20f 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
@@ -611,7 +611,7 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf)
        if (!adapter->priv_num)
                return;
 
-       if (user_rmmod) {
+       if (user_rmmod && !adapter->mfg_mode) {
 #ifdef CONFIG_PM
                if (adapter->is_suspended)
                        mwifiex_usb_resume(intf);