p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Richard Schütz 2017-10-29 13:03:22 +01:00 committed by Marc Kleine-Budde
parent 1cb483a5cc
commit fb5f0b3ef6
2 changed files with 0 additions and 2 deletions
drivers/net/can/c_can
c_can_pci.cc_can_platform.c

1
drivers/net/can/c_can/c_can_pci.c
View File

@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_dev *pdev,
break; break;
case BOSCH_D_CAN: case BOSCH_D_CAN:
priv->regs = reg_map_d_can; priv->regs = reg_map_d_can;
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;

1
drivers/net/can/c_can/c_can_platform.c
View File

@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
break; break;
case BOSCH_D_CAN: case BOSCH_D_CAN:
priv->regs = reg_map_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->read_reg = c_can_plat_read_reg_aligned_to_16bit;
priv->write_reg = c_can_plat_write_reg_aligned_to_16bit; priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
priv->read_reg32 = d_can_plat_read_reg32; priv->read_reg32 = d_can_plat_read_reg32;