[PATCH 4/4] Revert "UBUNTU: SAUCE: Revert "lan78xx: Correctly indicate invalid OTP""
Paolo Pisati
paolo.pisati at canonical.com
Fri Nov 9 15:44:22 UTC 2018
BugLink: http://bugs.launchpad.net/bugs/1802320
This reverts commit 1111a9e0bd2ebab88e736d8a9773df2ec76dc52c.
Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
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 0b3e6e2..bf68efb 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -619,7 +619,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.7.4
More information about the kernel-team
mailing list