diff options
| author | Andrew Morton <akpm@osdl.org> | 2007-05-09 02:34:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 12:30:51 -0700 |
| commit | d0758bc334780d70266c1d1b974ed26f740a0819 (patch) | |
| tree | f60114dcee62542f5ecc3ce6b540bbd5b99f0c8e /drivers/net | |
| parent | 67ac58edf771b10f8e89bf9fe1ccf6c9b92ce063 (diff) | |
phy: use flush_work_keventd()
(akpm: bypassed maintainers, sorry. There are other patches which depend on
this)
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/phy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index eed433d6056a..f445c465b14e 100644 --- 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); |