diff options
author | David S. Miller <davem@davemloft.net> | 2016-03-04 20:32:47 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-04 20:32:47 +0100 |
commit | 390fd4fa9f1053e282e871af42eb32ba0ea76f88 (patch) | |
tree | 1988f2ad6c038661dd1b5a925b624dad908c1332 | |
parent | be2net: don't enable multicast flag in be_enable_if_filters() routine (diff) | |
parent | can: mcp251x: avoid write to error flag register if it's unnecessary (diff) | |
download | linux-390fd4fa9f1053e282e871af42eb32ba0ea76f88.tar.xz linux-390fd4fa9f1053e282e871af42eb32ba0ea76f88.zip |
Merge tag 'linux-can-fixes-for-4.5-20160304' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2016-03-04
this is a pull request for net/master.
There is one patch from Ed Spiridonov, which increases the performance of the
mcp251x SPI CAN driver, by avoiding to write to error flag register if it's
unnecessary.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/can/spi/mcp251x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c index 575790e8a75a..74a7dfecee27 100644 --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c @@ -843,7 +843,7 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id) if (clear_intf) mcp251x_write_bits(spi, CANINTF, clear_intf, 0x00); - if (eflag) + if (eflag & (EFLG_RX0OVR | EFLG_RX1OVR)) mcp251x_write_bits(spi, EFLG, eflag, 0x00); /* Update can state */ |