aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-05-11 11:50:27 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-05-23 15:09:06 +0200
commit3e1c92f9e1be108df2042ab211cc8d68938e6af9 (patch)
tree4c584e34aca05f31dec4141b7d446dc283f9c36c /target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
parentf726b37b681866145701bd1324c9c654312fa779 (diff)
downloadupstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.tar.gz
upstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.tar.bz2
upstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.zip
kernel: bump 5.4 to 5.4.118
Manually rebased: ath79/patches-5.4/0033-spi-ath79-drop-pdata-support.patch Removed uneeded patch: ath79/patches-5.4/0050-spi-ath79-remove-spi-master-setup-and-cleanup-assign.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch')
-rw-r--r--target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch b/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
index 2a6b9857fb..51a71c6ef2 100644
--- a/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
+++ b/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
@@ -58,7 +58,7 @@ Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
static int ath79_spi_probe(struct platform_device *pdev)
{
struct spi_master *master;
-@@ -163,6 +197,7 @@ static int ath79_spi_probe(struct platfo
+@@ -164,6 +198,7 @@ static int ath79_spi_probe(struct platfo
ret = PTR_ERR(sp->base);
goto err_put_master;
}