diff options
| author | Shahed Shaikh <shahed.shaikh@qlogic.com> | 2013-06-21 12:09:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-24 00:28:28 -0700 |
| commit | f57da7a65b386dd4535daa4f7a3773a025fbb022 (patch) | |
| tree | 810364eb46a754b2179e17331636f7606dae747d /drivers/net/ethernet | |
| parent | b90fc27a64a57b273351ceef7ae298558ff8a6ac (diff) | |
| download | linux-3.10-f57da7a65b386dd4535daa4f7a3773a025fbb022.tar.gz linux-3.10-f57da7a65b386dd4535daa4f7a3773a025fbb022.tar.bz2 linux-3.10-f57da7a65b386dd4535daa4f7a3773a025fbb022.zip | |
qlcnic: Do not sleep while holding spinlock
This patch reverts commit a4791254b6625b06aa33e36304f6e8a1a4a1fdea
("qlcnic: change mdelay to msleep") which overwrote a commit
68b3f28c11bf896be32ad2a2e151aaa5f4a7c98e
("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>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c index 43562c25637..6acf82b9f01 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c @@ -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); } } |