diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-03-26 15:19:42 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-03-28 13:03:02 +0100 |
| commit | 5ecc0cfd6f3da1e8f573024753169aa6f115745e (patch) | |
| tree | 23aa098938d7a572de3f56bc35661cd5cb2a05aa /target/linux/octeontx/patches-5.4/0003-can-mcp251x-convert-to-half-duplex-SPI.patch | |
| parent | bf15557f8a85e7ada25074122f4af5bd3a5df697 (diff) | |
| download | upstream-5ecc0cfd6f3da1e8f573024753169aa6f115745e.tar.gz upstream-5ecc0cfd6f3da1e8f573024753169aa6f115745e.tar.bz2 upstream-5ecc0cfd6f3da1e8f573024753169aa6f115745e.zip | |
kernel: bump 5.4 to 5.4.28
Changelog since 5.4.24 mentions CVE-2019-19769, CVE-2020-8648,
CVE-2020-8649 and CVE-2020-8647.
Removed upstreamed:
generic: 507-v5.6-iio-chemical-sps30-fix-missing-triggered-buffer-depe.patch
generic: 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch
bcm27xx: 950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch
ipq806x: 701-stmmac-fix-notifier-registration.patch
lantiq: 002-pinctrl-falcon-fix-syntax-error.patch
octeontx: 0002-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
Run tested: apu2, qemu-x86-64, apalis, a64-olinuxino, nbg6617
Build tested: sunxi/a53, imx6, x86/64, ipq40xx
Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/octeontx/patches-5.4/0003-can-mcp251x-convert-to-half-duplex-SPI.patch')
| -rw-r--r-- | target/linux/octeontx/patches-5.4/0003-can-mcp251x-convert-to-half-duplex-SPI.patch | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/target/linux/octeontx/patches-5.4/0003-can-mcp251x-convert-to-half-duplex-SPI.patch b/target/linux/octeontx/patches-5.4/0003-can-mcp251x-convert-to-half-duplex-SPI.patch index aabf1b9b1e..6096fcf2be 100644 --- a/target/linux/octeontx/patches-5.4/0003-can-mcp251x-convert-to-half-duplex-SPI.patch +++ b/target/linux/octeontx/patches-5.4/0003-can-mcp251x-convert-to-half-duplex-SPI.patch @@ -12,11 +12,9 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> drivers/net/can/spi/mcp251x.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c -index 0b0dd3f0..c655b29 100644 --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c -@@ -345,8 +345,7 @@ static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg) +@@ -291,23 +291,23 @@ static u8 mcp251x_read_reg(struct spi_de priv->spi_tx_buf[0] = INSTRUCTION_READ; priv->spi_tx_buf[1] = reg; @@ -26,9 +24,8 @@ index 0b0dd3f0..c655b29 100644 return val; } -@@ -354,15 +353,16 @@ static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg) - static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg, - uint8_t *v1, uint8_t *v2) + + static void mcp251x_read_2regs(struct spi_device *spi, u8 reg, u8 *v1, u8 *v2) { + u8 val[4] = {0}; struct mcp251x_priv *priv = spi_get_drvdata(spi); @@ -45,7 +42,4 @@ index 0b0dd3f0..c655b29 100644 + *v2 = val[1]; } - static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val) --- -2.7.4 - + static void mcp251x_write_reg(struct spi_device *spi, u8 reg, u8 val) |