net: dp83869: Reset return variable if PHY strap is read
Subsystems (3)
PATCH 1/1 net: dp83869: Reset return variable if PHY strap is read
When the PHY's strap register is read to determine if lane swapping is needed the phy_read_mmd returns the value back into the ret variable.
If the call to read the strap fails the failed value is returned. If the call to read the strap is successful then ret is possibly set to a non-zero positive number. Without reseting the ret value to 0 this will cause the parse DT function to return a failure.
--- drivers/net/phy/dp83869.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/phy/dp83869.c +3 -0
@@ -218,10 +218,13 @@ static int dp83869_of_init(struct phy_device *phydev) ret =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_STRAP_STS1 );if (ret <0 )return ret; +if (ret &DP83869_STRAP_MIRROR_ENABLED ) dp83869->port_mirroring =DP83869_PORT_MIRRORING_EN ;else dp83869->port_mirroring =DP83869_PORT_MIRRORING_DIS ; + + ret =0 ; } if (of_property_read_u32(of_node, "rx-fifo-depth",
Signature · 1 line
2.26.2
Quoted 10 lines · Dan Murphy
When the PHY's strap register is read to determine if lane swapping is needed the
phy_read_mmdreturns the value back into the ret variable.If the call to read the strap fails the failed value is returned. If the call to read the strap is successful then ret is possibly set to a non-zero positive number. Without reseting the ret value to 0 this will cause the parse DT function to return a failure.
Fixes c4566aec6e808 ("net: phy: dp83869: Update port-mirroring to read straps")Signed-off-by Dan Murphy <[email protected]>
Signature · 1 line
Florian
From: Dan Murphy <[email protected]>
Date: Fri, 5 Jun 2020 15:51:03 -0500
Quoted 10 lines
When the PHY's strap register is read to determine if lane swapping is needed the
phy_read_mmdreturns the value back into the ret variable.If the call to read the strap fails the failed value is returned. If the call to read the strap is successful then ret is possibly set to a non-zero positive number. Without reseting the ret value to 0 this will cause the parse DT function to return a failure.
Fixes c4566aec6e808 ("net: phy: dp83869: Update port-mirroring to read straps")Signed-off-by Dan Murphy <[email protected]>
Applied, thank you.