diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-28 18:36:04 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-28 18:36:04 +0200 |
| commit | 942f6085cd5714acb59eb2534306943050805eb5 (patch) | |
| tree | 8c9ed8e890030c266adb3a4be3d8b4b01cd2774b /drivers/net/phy | |
| parent | 1793d83f61bb9e261c22781964665ff50bf61831 (diff) | |
| parent | 115472395b0a9ea522ba0e106d6dfd7a73df8ba6 (diff) | |
Merge tag 'v5.15.104' into 5.15-2.2.x-imx
This is the 5.15.104 stable release
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/nxp-c45-tja11xx.c | 2 | ||||
| -rw-r--r-- | drivers/net/phy/smsc.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c index 91a327f67a42..fbb64aa32404 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -79,7 +79,7 @@ #define SGMII_ABILITY BIT(0) #define VEND1_MII_BASIC_CONFIG 0xAFC6 -#define MII_BASIC_CONFIG_REV BIT(8) +#define MII_BASIC_CONFIG_REV BIT(4) #define MII_BASIC_CONFIG_SGMII 0x9 #define MII_BASIC_CONFIG_RGMII 0x7 #define MII_BASIC_CONFIG_RMII 0x5 diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 04e628788f1b..36dcf6c7f445 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -206,8 +206,11 @@ static int lan95xx_config_aneg_ext(struct phy_device *phydev) static int lan87xx_read_status(struct phy_device *phydev) { struct smsc_phy_priv *priv = phydev->priv; + int err; - int err = genphy_read_status(phydev); + err = genphy_read_status(phydev); + if (err) + return err; if (!phydev->link && priv->energy_enable && phydev->irq == PHY_POLL) { /* Disable EDPD to wake up PHY */ |