diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2013-05-06 22:52:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 07:51:37 -0700 |
| commit | 2a437cd36e627752e9cac71bfec6293f1e4e4144 (patch) | |
| tree | e064d555bf30181625d7a6a3f70503b25c3f6f3a /drivers/net | |
| parent | 51a26ae7a14b85c99c9be470c2d28eeeba0f26a3 (diff) | |
| download | op-kernel-dev-2a437cd36e627752e9cac71bfec6293f1e4e4144.zip op-kernel-dev-2a437cd36e627752e9cac71bfec6293f1e4e4144.tar.gz | |
e1000e: fix scheduling while atomic bug
A scheduling while atomic bug was introduced recently (by commit
ce43a2168c59: "e1000e: cleanup USLEEP_RANGE checkpatch checks").
Revert the particular instance of usleep_range() which causes the bug.
Reported-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/e1000.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h index 82f1c8428..ffbc08f 100644 --- a/drivers/net/ethernet/intel/e1000e/e1000.h +++ b/drivers/net/ethernet/intel/e1000e/e1000.h @@ -600,7 +600,7 @@ static inline s32 __ew32_prepare(struct e1000_hw *hw) s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT; while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i) - usleep_range(50, 100); + udelay(50); return i; } |
