From: Bruce Allan <bruce.w.allan@intel.com>
Date: Tue, 7 May 2013 05:52:47 +0000 (-0700)
Subject: e1000e: fix scheduling while atomic bug
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a437cd36e627752e9cac71bfec6293f1e4e4144;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed