From: Andrew Morton <akpm@osdl.org>

Cc: "Maciej W. Rozycki" <macro@ds2.pg.gda.pl>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/net/phy/phy.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff -puN drivers/net/phy/phy.c~libphy-dont-do-that drivers/net/phy/phy.c
--- a/drivers/net/phy/phy.c~libphy-dont-do-that
+++ a/drivers/net/phy/phy.c
@@ -583,12 +583,7 @@ int phy_stop_interrupts(struct phy_devic
 	if (err)
 		phy_error(phydev);
 
-	/*
-	 * Finish any pending work; we might have been scheduled
-	 * to be called from keventd ourselves, though.
-	 */
-	if (!current_is_keventd())
-		flush_scheduled_work();
+	flush_scheduled_work();
 
 	free_irq(phydev->irq, phydev);
 
_