aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/flexcan.c
diff options
context:
space:
mode:
authorLuu An Phu <phu.luuan@nxp.com>2018-01-02 10:44:18 +0700
committerMarc Kleine-Budde <mkl@pengutronix.de>2018-01-04 16:14:38 +0100
commit13454c14550065fcc1705d6bd4ee6d40e057099f (patch)
treed848eeb277470e3841c7c394cd4f060a92eb2fbb /drivers/net/can/flexcan.c
parentcan: gs_usb: fix return value of the "set_bittiming" callback (diff)
downloadlinux-dev-13454c14550065fcc1705d6bd4ee6d40e057099f.tar.xz
linux-dev-13454c14550065fcc1705d6bd4ee6d40e057099f.zip
can: flex_can: Correct the checking for frame length in flexcan_start_xmit()
The flexcan_start_xmit() function compares the frame length with data register length to write frame content into data[0] and data[1] register. Data register length is 4 bytes and frame maximum length is 8 bytes. Fix the check that compares frame length with 3. Because the register length is 4. Signed-off-by: Luu An Phu <phu.luuan@nxp.com> Reviewed-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/flexcan.c')
-rw-r--r--drivers/net/can/flexcan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 0626dcfd1f3d..760d2c07e3a2 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -526,7 +526,7 @@ static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
data = be32_to_cpup((__be32 *)&cf->data[0]);
flexcan_write(data, &priv->tx_mb->data[0]);
}
- if (cf->can_dlc > 3) {
+ if (cf->can_dlc > 4) {
data = be32_to_cpup((__be32 *)&cf->data[4]);
flexcan_write(data, &priv->tx_mb->data[1]);
}