]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
can: xilinx_can: xcan_set_bittiming(): fix the data phase btr1 calculation
authorSrinivas Neeli <srinivas.neeli@xilinx.com>
Mon, 12 Aug 2019 10:06:46 +0000 (15:36 +0530)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 13 Aug 2019 15:32:19 +0000 (17:32 +0200)
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>
drivers/net/can/xilinx_can.c

index f939f7ac5b64d1dc28bd3a6f6e5bdff29c1c721d..911b34316c9d4394464070af8a071537f6c796fc 100644 (file)
@@ -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;