aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-03-24 21:47:36 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-03-27 16:26:56 +0100
commit2464a9a8a4a3c7b4a0cb63db42b9906a0297979a (patch)
tree3259691b8c14d1e3ffe56676868711985590f68b /target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
parente8cbdbbe97d55b77062a3d80f42c87cb761e9729 (diff)
downloadupstream-2464a9a8a4a3c7b4a0cb63db42b9906a0297979a.tar.gz
upstream-2464a9a8a4a3c7b4a0cb63db42b9906a0297979a.tar.bz2
upstream-2464a9a8a4a3c7b4a0cb63db42b9906a0297979a.zip
kernel: bump 5.4 to 5.4.108
Refreshed all patches. Compile-tested on: x86_64, ath79, lantiq Runtime-tested on: x86_64, ath79 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch b/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
index bc0d8b3aef..85164096f3 100644
--- a/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
@@ -28,7 +28,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
#include <linux/regmap.h>
#define DRV_NAME "flexcan"
-@@ -1959,9 +1960,7 @@ static int __maybe_unused flexcan_suspen
+@@ -1965,9 +1966,7 @@ static int __maybe_unused flexcan_suspen
if (err)
return err;
} else {
@@ -39,7 +39,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
}
netif_stop_queue(dev);
netif_device_detach(dev);
-@@ -1987,7 +1986,9 @@ static int __maybe_unused flexcan_resume
+@@ -1993,7 +1992,9 @@ static int __maybe_unused flexcan_resume
if (err)
return err;
} else {