From: Bruce Allan Date: Tue, 19 Mar 2013 01:47:12 +0000 (+0000) Subject: e1000e: fix scheduling while atomic bugs X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~280^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=274a85e095b8265c3b759a60f8c52b9993d89d3b;p=pandora-kernel.git 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 Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher --- Reading git-diff-tree failed