Skip to content

Commit fb5f0b3

Browse files
richardschuetzmarckleinebudde
authored andcommitted
can: c_can: don't indicate triple sampling support for D_CAN
The D_CAN controller doesn't provide a triple sampling mode, so don't set the CAN_CTRLMODE_3_SAMPLES flag in ctrlmode_supported. Currently enabling triple sampling is a no-op. Signed-off-by: Richard Schütz <rschuetz@uni-koblenz.de> Cc: linux-stable <stable@vger.kernel.org> # >= v3.6 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 parent 1cb483a commit fb5f0b3

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

drivers/net/can/c_can/c_can_pci.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_dev *pdev,
178178
break;
179179
case BOSCH_D_CAN:
180180
priv->regs = reg_map_d_can;
181-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
182181
break;
183182
default:
184183
ret = -EINVAL;

drivers/net/can/c_can/c_can_platform.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
320320
break;
321321
case BOSCH_D_CAN:
322322
priv->regs = reg_map_d_can;
323-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
324323
priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
325324
priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
326325
priv->read_reg32 = d_can_plat_read_reg32;

0 commit comments

Comments
 (0)