diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-11-24 14:21:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-24 14:21:45 -0500 |
| commit | 90bb81f38c40791d7cda5db52f53107d9f074f33 (patch) | |
| tree | 0d9d0c993eebfd1e7e46f96981471388bdf4f21a /drivers/net/can/pch_can.c | |
| parent | tipc: fix error handling of expanding buffer headroom (diff) | |
| parent | can: remove obsolete assignment for CAN protocol error type (diff) | |
| download | linux-dev-90bb81f38c40791d7cda5db52f53107d9f074f33.tar.xz linux-dev-90bb81f38c40791d7cda5db52f53107d9f074f33.zip | |
Merge tag 'linux-can-fixes-for-4.4-20151123' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2015-11-23
this is a pull request of three patches for the upcoming v4.4 release.
The first patch is by Mirza Krak, it fixes a problem with the sja1000 driver
after resuming from suspend to disk, by clearing all outstanding interrupts.
Oliver Hartkopp contributes two patches targeting almost all driver, they fix
the assignment of the error location in CAN error messages.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/pch_can.c')
| -rw-r--r-- | drivers/net/can/pch_can.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index e187ca783da0..c1317889d3d8 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c @@ -559,8 +559,7 @@ static void pch_can_error(struct net_device *ndev, u32 status) stats->rx_errors++; break; case PCH_CRC_ERR: - cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ | - CAN_ERR_PROT_LOC_CRC_DEL; + cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ; priv->can.can_stats.bus_error++; stats->rx_errors++; break; |