Linux v4.16-11958-g16e205cf42da
This commit is contained in:
parent
40766321c4
commit
a242ace429
@ -28,35 +28,6 @@ index a21039852f8d..cd20ce4ed87d 100644
|
||||
ret = lan78xx_write_reg(dev, HW_CFG, buf);
|
||||
|
||||
ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
|
||||
From f8a798bb45ae15cbec980c8e921eb377fd1a3df6 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.org>
|
||||
Date: Tue, 28 Nov 2017 12:02:37 +0000
|
||||
Subject: [PATCH] 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 cd20ce4ed87d..b270935f3f8d 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;
|
||||
From 4a4710f3847cd087e150f83382dffd92e09d9914 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.org>
|
||||
Date: Sat, 17 Mar 2018 00:10:02 +0100
|
||||
|
2
gitrev
2
gitrev
@ -1 +1 @@
|
||||
e241e3f2bf975788a1b70dff2eb5180ca395b28e
|
||||
16e205cf42da1f497b10a4a24f563e6c0d574eec
|
||||
|
@ -69,7 +69,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%global rcrev 0
|
||||
# The git snapshot level
|
||||
%define gitrev 8
|
||||
%define gitrev 9
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -1864,6 +1864,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Apr 13 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git9.1
|
||||
- Linux v4.16-11958-g16e205cf42da
|
||||
|
||||
* Thu Apr 12 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git8.1
|
||||
- Linux v4.16-11766-ge241e3f2bf97
|
||||
|
||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
|
||||
SHA512 (patch-4.16-git8.xz) = 2da7db8d3f99426947242f1e978f536bb9a175ee4a249f7bc1350e13a6144d8ce753051a7cc2c178aaa1bec371d37a7fa076384a04fb8c5853a473db1c7d25d9
|
||||
SHA512 (patch-4.16-git9.xz) = 2a78f7fd091aa2e7af1cb53537efc7d73a98068b1a98e47d77aa4673a8c0d874a60181cd888cf431011dff726ebb52e81d4983cc5ce65f1a5e2697d04d5490e4
|
||||
|
Loading…
Reference in New Issue
Block a user