Message ID | 1494296075-29477-14-git-send-email-trini@konsulko.com |
---|---|
State | Accepted |
Commit | 4201223de8e6bac403213ad57769dfa723db36e3 |
Delegated to: | Tom Rini |
Headers | show |
On Mon, May 08, 2017 at 10:14:32PM -0400, Tom Rini wrote: > The variable 'res' may be unused uninitialized if our call to > mv88e61xx_port_read (register read) fails and we goto the error > handling section. In this case we set 'res' to -EIO to indicate why we > failed. > > Cc: Joe Hershberger <joe.hershberger@ni.com> > Cc: Chris Packham <judge.packham@gmail.com> > Cc: Kevin Smith <kevin.smith@elecsyscorp.com> > Cc: Prafulla Wadaskar <prafulla@marvell.com> > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c index a2fd1686fc3b..3d2f6b98ad0e 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -655,8 +655,10 @@ static int mv88e61xx_read_port_config(struct phy_device *phydev, u8 port) do { val = mv88e61xx_port_read(phydev, port, PORT_REG_STATUS); - if (val < 0) + if (val < 0) { + res = -EIO; goto unforce; + } if (val & PORT_REG_STATUS_LINK) break; } while (--timeout);
The variable 'res' may be unused uninitialized if our call to mv88e61xx_port_read (register read) fails and we goto the error handling section. In this case we set 'res' to -EIO to indicate why we failed. Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Chris Packham <judge.packham@gmail.com> Cc: Kevin Smith <kevin.smith@elecsyscorp.com> Cc: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Tom Rini <trini@konsulko.com> --- drivers/net/phy/mv88e61xx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)