diff options
| author | Alexander Stein <alexander.stein@systec-electronic.com> | 2014-08-12 08:47:21 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:38:30 (GMT) |
| commit | 501b81d0dc746b9f323c5b597c94b492012e7495 (patch) | |
| tree | 0e34bc7c44b1085f6c50415123217b6844996322 /drivers/net/can | |
| parent | 81749756100bb0d4f8977a92a5e2cb6deb21e296 (diff) | |
| download | linux-fsl-qoriq-501b81d0dc746b9f323c5b597c94b492012e7495.tar.xz | |
can: flexcan: Disable error interrupt when bus error reporting is disabled
In case we don't have FLEXCAN_HAS_BROKEN_ERR_STATE and the user set
CAN_CTRLMODE_BERR_REPORTING once it can not be unset again until reboot.
So in case neither hardware nor user wants the error interrupt disable
the bit.
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Cherry-picked from linux-next: bc03a54139baafcd8fe89ad115411c2c9c8a4905
Change-Id: Ieb52a8f0cc761a37faf4556284bf2c922c6bec79
Reviewed-on: http://git.am.freescale.net:8181/21844
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/flexcan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 7e816e9..826b424 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -908,6 +908,8 @@ static int flexcan_chip_start(struct net_device *dev) if (priv->devtype_data->features & FLEXCAN_HAS_BROKEN_ERR_STATE || priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) reg_ctrl |= FLEXCAN_CTRL_ERR_MSK; + else + reg_ctrl &= ~FLEXCAN_CTRL_ERR_MSK; /* save for later use */ priv->reg_ctrl_default = reg_ctrl; |