Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6be4cb5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: phy: Re-enable phy intr after phy reset on max idle err cnt"

parents a2fea781 271225fa

drivers/net/phy/micrel.c

+3 −1
Original line number Diff line number Diff line
@@ -622,7 +622,9 @@ static int ksz9031_read_status(struct phy_device *phydev) 
	if ((regval & 0xFF) == 0xFF) {

		phy_init_hw(phydev);

		phydev->link = 0;

		if (phydev->drv->config_intr && phy_interrupt_is_valid(phydev))

		if (phydev->drv->config_intr &&

		    (phydev->irq == PHY_IGNORE_INTERRUPT ||

		     phy_interrupt_is_valid(phydev)))

			phydev->drv->config_intr(phydev);

		return genphy_config_aneg(phydev);

	}