diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-03 14:45:04 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-03 14:45:04 +0300 |
| commit | 4ac0f06ca044e3ca938681a0eeb7d52a68b0b30f (patch) | |
| tree | 9433afff899211152ff78ed38f9a70ab2bb497fc /drivers/net/phy/micrel.c | |
| parent | 34864c05a54d1bc544c8c3939aababbc481d99e3 (diff) | |
| parent | c3f38fa61af77b49866b006939479069cd451173 (diff) | |
| download | linux-4ac0f06ca044e3ca938681a0eeb7d52a68b0b30f.tar.xz | |
ASoC: Merge up fixes
We need this to get the i.MX platforms working in CI again.
Diffstat (limited to 'drivers/net/phy/micrel.c')
| -rw-r--r-- | drivers/net/phy/micrel.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 13e30ea7eec5..2b8f8b7f1517 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -4029,7 +4029,7 @@ static int lan8841_config_intr(struct phy_device *phydev) if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { err = phy_read(phydev, LAN8814_INTS); - if (err) + if (err < 0) return err; /* Enable / disable interrupts. It is OK to enable PTP interrupt @@ -4045,6 +4045,14 @@ static int lan8841_config_intr(struct phy_device *phydev) return err; err = phy_read(phydev, LAN8814_INTS); + if (err < 0) + return err; + + /* Getting a positive value doesn't mean that is an error, it + * just indicates what was the status. Therefore make sure to + * clear the value and say that there is no error. + */ + err = 0; } return err; @@ -5327,6 +5335,7 @@ static struct phy_driver ksphy_driver[] = { /* PHY_BASIC_FEATURES */ .probe = kszphy_probe, .config_init = ksz8061_config_init, + .soft_reset = genphy_soft_reset, .config_intr = kszphy_config_intr, .handle_interrupt = kszphy_handle_interrupt, .suspend = kszphy_suspend, |