---

yaml
---
r: 33147
b: refs/heads/master
c: 817acf5
h: refs/heads/master
i:
  33145: 8920012
  33143: fc01f36
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75c30b1368faaa9c740536b91a15a33aab62f30b
+refs/heads/master: 817acf5ebd9ea21f134fc90064b0f6686c5b169d

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;
 }