kernel: bump 5.4 to 5.4.79

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch

diff --git a/target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch b/target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch
index bc84f5f907db76826e3b8b5be21c8029a44be192..9c2dde99a96096ae48e152499620a15d664e839f 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch
@@ -18,7 +18,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -744,8 +744,6 @@ static void flexcan_irq_state(struct net
+@@ -743,8 +743,6 @@ static void flexcan_irq_state(struct net
        u32 timestamp;
        int err;
  
@@ -27,7 +27,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        flt = reg_esr & FLEXCAN_ESR_FLT_CONF_MASK;
        if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {
                tx_state = unlikely(reg_esr & FLEXCAN_ESR_TX_WRN) ?
-@@ -765,6 +763,8 @@ static void flexcan_irq_state(struct net
+@@ -764,6 +762,8 @@ static void flexcan_irq_state(struct net
        if (likely(new_state == priv->can.state))
                return;