kernel: bump 5.4 to 5.4.109
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
index 85164096f35bf2f6a090c5c9d71f59b71fbcdd26..b8349e6d6dd0de4a5eb21b64c6b8ec0844a2a48f 100644 (file)
@@ -28,7 +28,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  #include <linux/regmap.h>
  
  #define DRV_NAME                      "flexcan"
  #include <linux/regmap.h>
  
  #define DRV_NAME                      "flexcan"
-@@ -1965,9 +1966,7 @@ static int __maybe_unused flexcan_suspen
+@@ -1971,9 +1972,7 @@ static int __maybe_unused flexcan_suspen
                        if (err)
                                return err;
                } else {
                        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);
                }
                netif_stop_queue(dev);
                netif_device_detach(dev);
-@@ -1993,7 +1992,9 @@ static int __maybe_unused flexcan_resume
+@@ -1999,7 +1998,9 @@ static int __maybe_unused flexcan_resume
                        if (err)
                                return err;
                } else {
                        if (err)
                                return err;
                } else {