e1000e: fix scheduling while atomic bugs
authorBruce Allan <bruce.w.allan@intel.com>
Tue, 19 Mar 2013 01:47:12 +0000 (01:47 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 28 Mar 2013 07:56:48 +0000 (00:56 -0700)
commit274a85e095b8265c3b759a60f8c52b9993d89d3b
treec00703877f166fa0120e91c32d51dd665a410dd5
parent8defe71382b27a6e416854b02d42b20d904b3839
e1000e: fix scheduling while atomic bugs

The previous commit ce43a2168c59bc47b5f0c1825fd5f9a2a9e3b447 (e1000e:
cleanup USLEEP_RANGE checkpatch checks) converted a number of delays and
sleeps as recommended in ./Documentation/timers/timers-howto.txt.
Unfortunately, a few of the udelay() to usleep_range() conversions are in
code paths that are in an atomic context in which usleep_range() should
not be used.  Revert those specific changes.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/phy.c