Commit 4bfc3380 authored by Phil Elwell's avatar Phil Elwell Committed by David S. Miller

lan78xx: Correctly indicate invalid OTP

lan78xx_read_otp tries to return -EINVAL in the event of invalid OTP
content, but the value gets overwritten before it is returned and the
read goes ahead anyway. Make the read conditional as it should be
and preserve the error code.

Fixes: 55d7de9d ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
Signed-off-by: default avatarPhil Elwell <phil@raspberrypi.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a43cced9
...@@ -928,6 +928,7 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset, ...@@ -928,6 +928,7 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset,
offset += 0x100; offset += 0x100;
else else
ret = -EINVAL; ret = -EINVAL;
if (!ret)
ret = lan78xx_read_raw_otp(dev, offset, length, data); ret = lan78xx_read_raw_otp(dev, offset, length, data);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment