--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -784,16 +784,23 @@ static inline struct flexcan_priv *rx_of
+@@ -783,16 +783,23 @@ static inline struct flexcan_priv *rx_of
return container_of(offload, struct flexcan_priv, offload);
}
mb = flexcan_get_mb(priv, n);
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
-@@ -807,7 +814,7 @@ static unsigned int flexcan_mailbox_read
+@@ -806,7 +813,7 @@ static unsigned int flexcan_mailbox_read
code = reg_ctrl & FLEXCAN_MB_CODE_MASK;
if ((code != FLEXCAN_MB_CODE_RX_FULL) &&
(code != FLEXCAN_MB_CODE_RX_OVERRUN))
if (code == FLEXCAN_MB_CODE_RX_OVERRUN) {
/* This MB was overrun, we lost data */
-@@ -817,11 +824,17 @@ static unsigned int flexcan_mailbox_read
+@@ -816,11 +823,17 @@ static unsigned int flexcan_mailbox_read
} else {
reg_iflag1 = priv->read(®s->iflag1);
if (!(reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE))
/* increase timstamp to full 32 bit */
*timestamp = reg_ctrl << 16;
-@@ -840,7 +853,7 @@ static unsigned int flexcan_mailbox_read
+@@ -839,7 +852,7 @@ static unsigned int flexcan_mailbox_read
*(__be32 *)(cf->data + i) = data;
}
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
/* Clear IRQ */
if (n < 32)
-@@ -857,7 +870,7 @@ static unsigned int flexcan_mailbox_read
+@@ -856,7 +869,7 @@ static unsigned int flexcan_mailbox_read
*/
priv->read(®s->timer);