mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
32 lines
1 KiB
Diff
32 lines
1 KiB
Diff
From 6865c1e7b3926a9377777dcf7d71ca678913d884 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Tue, 28 Nov 2017 12:02:37 +0000
|
|
Subject: [PATCH 150/277] 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.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/net/usb/lan78xx.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
|
|
index 2727ce1f9b53..ee95fc957e1f 100644
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
+++ b/drivers/net/usb/lan78xx.c
|
|
@@ -929,7 +929,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;
|
|
--
|
|
2.16.1
|
|
|