Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb5f0b3e authored by Richard Schütz's avatar Richard Schütz Committed by Marc Kleine-Budde
Browse files

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: default avatarRichard Schütz <rschuetz@uni-koblenz.de>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.6
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 1cb483a5

drivers/net/can/c_can/c_can_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_dev *pdev, 
		break;

	case BOSCH_D_CAN:

		priv->regs = reg_map_d_can;

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;

		break;

	default:

		ret = -EINVAL;

drivers/net/can/c_can/c_can_platform.c

+0 −1
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platform_device *pdev) 
		break;

	case BOSCH_D_CAN:

		priv->regs = reg_map_d_can;

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;

		priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;

		priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;

		priv->read_reg32 = d_can_plat_read_reg32;