diff options
| author | Phil Elwell <phil@raspberrypi.org> | 2018-04-11 11:59:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-11 16:30:42 +0200 |
| commit | 4bfc33807a9a02764bdd1e42e794b3b401240f27 (patch) | |
| tree | 3b52134fb2776c37657f153c275a9d264a5ba9f5 /drivers | |
| parent | rds: MP-RDS may use an invalid c_path (diff) | |
| download | linux-4bfc33807a9a02764bdd1e42e794b3b401240f27.tar.xz linux-4bfc33807a9a02764bdd1e42e794b3b401240f27.zip | |
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: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/lan78xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index aff105f5f58c..145bb7cbf5b2 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -928,7 +928,8 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset, offset += 0x100; else ret = -EINVAL; - ret = lan78xx_read_raw_otp(dev, offset, length, data); + if (!ret) + ret = lan78xx_read_raw_otp(dev, offset, length, data); } return ret; |