From: Srinivas Neeli <srinivas.neeli@xilinx.com>
Date: Mon, 12 Aug 2019 10:06:46 +0000 (+0530)
Subject: can: xilinx_can: xcan_set_bittiming(): fix the data phase btr1 calculation
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e994ff28f867a20ae0dd055a5e4a4a34aad9c3c;p=linux.git

can: xilinx_can: xcan_set_bittiming(): fix the data phase btr1 calculation

While calculating bitrate for the data phase, the driver is using phase
segment 1 of the arbitration phase instead of the data phase.

Fixes: c223da6 ("can: xilinx_can: Add support for CANFD FD frames")
Signed-off-by: Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>
Signed-off-by: Srinivas Neeli <srinivas.neeli@xilinx.com>
Acked-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---

diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index f939f7ac5b64d..911b34316c9d4 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -425,7 +425,7 @@ static int xcan_set_bittiming(struct net_device *ndev)
 		btr0 = dbt->brp - 1;
 
 		/* Setting Time Segment 1 in BTR Register */
-		btr1 = dbt->prop_seg + bt->phase_seg1 - 1;
+		btr1 = dbt->prop_seg + dbt->phase_seg1 - 1;
 
 		/* Setting Time Segment 2 in BTR Register */
 		btr1 |= (dbt->phase_seg2 - 1) << priv->devtype.btr_ts2_shift;