| Message ID | tencent_CB5C5128AF37DA63529E0EED826B5F4F5B06@qq.com |
|---|---|
| State | Accepted |
| Commit | e2b6cf5cadc0b71f4addbe0019f7da0c8578c194 |
| Delegated to: | Ramon Fried |
| Headers | show |
| Series | net: phy: dp83867: Fix a never true comparison | expand |
On Sat, Mar 19, 2022 at 4:02 PM <li.haolin@qq.com> wrote: > > From: Haolin Li <li.haolin@qq.com> > > The type of the return value of phy_read() and phy_read_mmd() is int. > Change the variable to not be unsigned so that we not get into an > unsigned compared against 0. > > Signed-off-by: Haolin Li <li.haolin@qq.com> > --- > drivers/net/phy/dp83867.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c > index eada4541c9..c5d44f4629 100644 > --- a/drivers/net/phy/dp83867.c > +++ b/drivers/net/phy/dp83867.c > @@ -266,7 +266,7 @@ static int dp83867_of_init(struct phy_device *phydev) > static int dp83867_config(struct phy_device *phydev) > { > struct dp83867_private *dp83867; > - unsigned int val, delay, cfg2; > + int val, delay, cfg2; > int ret, bs; > > dp83867 = (struct dp83867_private *)phydev->priv; > @@ -291,8 +291,11 @@ static int dp83867_config(struct phy_device *phydev) > > if (phy_interface_is_rgmii(phydev)) { > val = phy_read(phydev, MDIO_DEVAD_NONE, MII_DP83867_PHYCTRL); > - if (val < 0) > + if (val < 0) { > + ret = val; > goto err_out; > + } > + > val &= ~DP83867_PHYCR_FIFO_DEPTH_MASK; > val |= (dp83867->fifo_depth << DP83867_PHYCR_FIFO_DEPTH_SHIFT); > > -- > 2.25.1 > Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
On Fri, Apr 1, 2022 at 6:32 PM Ramon Fried <rfried.dev@gmail.com> wrote: > > On Sat, Mar 19, 2022 at 4:02 PM <li.haolin@qq.com> wrote: > > > > From: Haolin Li <li.haolin@qq.com> > > > > The type of the return value of phy_read() and phy_read_mmd() is int. > > Change the variable to not be unsigned so that we not get into an > > unsigned compared against 0. > > > > Signed-off-by: Haolin Li <li.haolin@qq.com> > > --- > > drivers/net/phy/dp83867.c | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c > > index eada4541c9..c5d44f4629 100644 > > --- a/drivers/net/phy/dp83867.c > > +++ b/drivers/net/phy/dp83867.c > > @@ -266,7 +266,7 @@ static int dp83867_of_init(struct phy_device *phydev) > > static int dp83867_config(struct phy_device *phydev) > > { > > struct dp83867_private *dp83867; > > - unsigned int val, delay, cfg2; > > + int val, delay, cfg2; > > int ret, bs; > > > > dp83867 = (struct dp83867_private *)phydev->priv; > > @@ -291,8 +291,11 @@ static int dp83867_config(struct phy_device *phydev) > > > > if (phy_interface_is_rgmii(phydev)) { > > val = phy_read(phydev, MDIO_DEVAD_NONE, MII_DP83867_PHYCTRL); > > - if (val < 0) > > + if (val < 0) { > > + ret = val; > > goto err_out; > > + } > > + > > val &= ~DP83867_PHYCR_FIFO_DEPTH_MASK; > > val |= (dp83867->fifo_depth << DP83867_PHYCR_FIFO_DEPTH_SHIFT); > > > > -- > > 2.25.1 > > > Reviewed-by: Ramon Fried <rfried.dev@gmail.com> Applied to u-boot-net/next Thanks, Ramon
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index eada4541c9..c5d44f4629 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c @@ -266,7 +266,7 @@ static int dp83867_of_init(struct phy_device *phydev) static int dp83867_config(struct phy_device *phydev) { struct dp83867_private *dp83867; - unsigned int val, delay, cfg2; + int val, delay, cfg2; int ret, bs; dp83867 = (struct dp83867_private *)phydev->priv; @@ -291,8 +291,11 @@ static int dp83867_config(struct phy_device *phydev) if (phy_interface_is_rgmii(phydev)) { val = phy_read(phydev, MDIO_DEVAD_NONE, MII_DP83867_PHYCTRL); - if (val < 0) + if (val < 0) { + ret = val; goto err_out; + } + val &= ~DP83867_PHYCR_FIFO_DEPTH_MASK; val |= (dp83867->fifo_depth << DP83867_PHYCR_FIFO_DEPTH_SHIFT);