phy: use flush_work_keventd()

(akpm: bypassed maintainers, sorry.  There are other patches which depend on
this)

Cc: "Maciej W. Rozycki" <[email protected]>
Cc: David Howells <[email protected]>
Cc: Jeff Garzik <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index eed433d6056a2ddae3bad391e09ebec087892475..f445c465b14e8b55be3d8945c42c9dd9ba68de13 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -662,10 +662,10 @@ int phy_stop_interrupts(struct phy_device *phydev)
                phy_error(phydev);
 
        /*
-        * Finish any pending work; we might have been scheduled
-        * to be called from keventd ourselves, though.
+        * Finish any pending work; we might have been scheduled to be called
+        * from keventd ourselves, but flush_work_keventd() handles that.
         */
-       run_scheduled_work(&phydev->phy_queue);
+       flush_work_keventd(&phydev->phy_queue);
 
        free_irq(phydev->irq, phydev);