Merge branch 'net-phy-Unbind-fixes' (0dfdbc74) · Commits · 戴 / test

Florian Fainelli says: ==================== net: phy: Unbind fixes This patch series fixes a couple of issues with the unbinding of the PHY drivers and then bringing down a network interface. The first is a NULL pointer de-reference and the second was an incorrect warning being triggered. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/phy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -996,7 +996,7 @@ void phy_stop(struct phy_device *phydev)
		{
		struct net_device *dev = phydev->attached_dev;

		if (!phy_is_started(phydev)) {
		if (!phy_is_started(phydev) && phydev->state != PHY_DOWN) {
		WARN(1, "called from state %s\n",
		phy_state_to_str(phydev->state));
		return;

drivers/net/phy/phy_device.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1682,6 +1682,7 @@ void phy_detach(struct phy_device *phydev)

		phy_led_triggers_unregister(phydev);

		if (phydev->mdio.dev.driver)
		module_put(phydev->mdio.dev.driver->owner);

		/* If the device had no specific driver before (i.e. - it

Admin message