diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-01-29 09:24:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-29 10:36:22 +0100 |
| commit | ae7f6711d6231c9ba54feb5ba9856c3775e482f8 (patch) | |
| tree | 89070c82204b2503348e4fd6c51d25a169375545 /drivers/net/phy/phy_device.c | |
| parent | perf session: Create kernel maps in the constructor (diff) | |
| parent | hw_breakpoints: Release the bp slot if arch_validate_hwbkpt_settings() fails. (diff) | |
| download | linux-dev-ae7f6711d6231c9ba54feb5ba9856c3775e482f8.tar.xz linux-dev-ae7f6711d6231c9ba54feb5ba9856c3775e482f8.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to queue up a dependent patch. Also update to
later -rc's.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 8212b2b93422..adbc0fded130 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -177,6 +177,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) dev->state = PHY_DOWN; mutex_init(&dev->lock); + INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); return dev; } |