]> git.baikalelectronics.ru Git - kernel.git/commitdiff
qlcnic: Do not sleep while holding spinlock
authorShahed Shaikh <shahed.shaikh@qlogic.com>
Fri, 21 Jun 2013 16:09:42 +0000 (12:09 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jun 2013 07:28:28 +0000 (00:28 -0700)
This patch reverts commit 1c2d8d46660908ce4393aae09ec40095715929c2
("qlcnic: change mdelay to msleep") which overwrote a commit
8a3401d44e116c306c60af10f89e569d87499f68
("qlcnic: Fix scheduling while atomic bug")

Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c

index 43562c256379539b8f739d4b72950886c067b75e..6acf82b9f01894d7c7e3e885e6f5cbc5760f3797 100644 (file)
@@ -642,7 +642,7 @@ void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter)
                                qlcnic_83xx_config_intrpt(adapter, 0);
                }
                /* Allow dma queues to drain after context reset */
-               msleep(20);
+               mdelay(20);
        }
 }