From: Greg Kroah-Hartman Date: Sun, 12 Nov 2017 09:08:17 +0000 (+0100) Subject: 3.18-stable patches X-Git-Tag: v3.18.81~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acccabae874c15c9d0ff6c30acf762c34870857b;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch --- diff --git a/queue-3.18/can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch b/queue-3.18/can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch new file mode 100644 index 00000000000..3c3e73e4d0e --- /dev/null +++ b/queue-3.18/can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch @@ -0,0 +1,45 @@ +From fb5f0b3ef69b95e665e4bbe8a3de7201f09f1071 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Richard=20Sch=C3=BCtz?= +Date: Sun, 29 Oct 2017 13:03:22 +0100 +Subject: can: c_can: don't indicate triple sampling support for D_CAN +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Richard Schütz + +commit fb5f0b3ef69b95e665e4bbe8a3de7201f09f1071 upstream. + +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 +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/can/c_can/c_can_pci.c | 1 - + drivers/net/can/c_can/c_can_platform.c | 1 - + 2 files changed, 2 deletions(-) + +--- a/drivers/net/can/c_can/c_can_pci.c ++++ b/drivers/net/can/c_can/c_can_pci.c +@@ -177,7 +177,6 @@ static int c_can_pci_probe(struct pci_de + break; + case BOSCH_D_CAN: + priv->regs = reg_map_d_can; +- priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; + break; + default: + ret = -EINVAL; +--- a/drivers/net/can/c_can/c_can_platform.c ++++ b/drivers/net/can/c_can/c_can_platform.c +@@ -257,7 +257,6 @@ static int c_can_plat_probe(struct platf + 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; diff --git a/queue-3.18/series b/queue-3.18/series index 1444e9cd9f5..7d24fb51510 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -24,3 +24,4 @@ mips-micromips-fix-incorrect-mask-in-insn_table_mm.patch mips-fix-cm-region-target-definitions.patch mips-ar7-ensure-that-serial-ports-are-properly-set-up.patch rbd-use-gfp_noio-for-parent-stat-and-data-requests.patch +can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch