From db789f4652d3223af2025ee0cd429c0e1312f3e5 Mon Sep 17 00:00:00 2001 From: Sergei Shtylylov Date: Wed, 26 Jul 2006 00:53:53 +0400 Subject: [PATCH] --- yaml --- r: 33147 b: refs/heads/master c: 817acf5ebd9ea21f134fc90064b0f6686c5b169d h: refs/heads/master i: 33145: 8920012b8265e2f1048ff12d5d92ca35642342be 33143: fc01f36df294bbd8e0d08d61984d11e1d5c581ef v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/phy.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fc6f8e14ac57..00a2d75d364e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75c30b1368faaa9c740536b91a15a33aab62f30b +refs/heads/master: 817acf5ebd9ea21f134fc90064b0f6686c5b169d diff --git a/trunk/drivers/net/phy/phy.c b/trunk/drivers/net/phy/phy.c index 7d5c2233c252..f5aad77288f9 100644 --- a/trunk/drivers/net/phy/phy.c +++ b/trunk/drivers/net/phy/phy.c @@ -419,9 +419,8 @@ void phy_start_machine(struct phy_device *phydev, /* phy_stop_machine * - * description: Stops the state machine timer, sets the state to - * UP (unless it wasn't up yet), and then frees the interrupt, - * if it is in use. This function must be called BEFORE + * description: Stops the state machine timer, sets the state to UP + * (unless it wasn't up yet). This function must be called BEFORE * phy_detach. */ void phy_stop_machine(struct phy_device *phydev) @@ -433,9 +432,6 @@ void phy_stop_machine(struct phy_device *phydev) phydev->state = PHY_UP; spin_unlock(&phydev->lock); - if (phydev->irq != PHY_POLL) - phy_stop_interrupts(phydev); - phydev->adjust_state = NULL; }