Commit 3bc32fd9 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: phylink: move PHY interrupt request to non-fail path 



The blamed commit added code which could return an error after we
requested the PHY interrupt. When we return an error, the caller
will call phy_detach() which fails to free the interrupt.

Rearrange the code such that failing operations happen before the
interrupt is requested, thereby allowing phy_detach() to be used.

Note that replacing phy_detach() with phy_disconnect() in these
paths could lead to freeing an interrupt which was never requested.

Fixes: 1942b1c6 ("net: phylink: make configuring clock-stop dependent on MAC support")
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1ut35k-00000001UEl-0iq6@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1de95db1

drivers/net/phy/phylink.c

+3 −3
Original line number Diff line number Diff line
@@ -2141,9 +2141,6 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy, 
		    __ETHTOOL_LINK_MODE_MASK_NBITS, pl->supported,

		    __ETHTOOL_LINK_MODE_MASK_NBITS, phy->advertising);



	if (phy_interrupt_is_valid(phy))

		phy_request_interrupt(phy);



	if (pl->config->mac_managed_pm)

		phy->mac_managed_pm = true;
@@ -2160,6 +2157,9 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy, 
			ret = 0;

	}



	if (ret == 0 && phy_interrupt_is_valid(phy))

		phy_request_interrupt(phy);



	return ret;

}