kernel: bump 5.4 to 5.4.106

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch

diff --git a/target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch b/target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch
index 348d564de576eadf07824c8f431314213976b42c..4822f9560737ef38e5aa337b5d5113924ed403bd 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch
@@ -70,7 +70,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        int err, i;
        struct flexcan_mb __iomem *mb;
  
-@@ -1224,8 +1224,9 @@ static int flexcan_chip_start(struct net
+@@ -1226,8 +1226,9 @@ static int flexcan_chip_start(struct net
        /* enable interrupts atomically */
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
@@ -82,7 +82,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enable_irq(dev->irq);
  
        /* print chip status */
-@@ -1322,19 +1323,14 @@ static int flexcan_open(struct net_devic
+@@ -1324,19 +1325,14 @@ static int flexcan_open(struct net_devic
        priv->offload.mailbox_read = flexcan_mailbox_read;
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {