diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-31 09:47:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-31 09:47:56 -0800 |
| commit | da0e51716646b8ca2aa91a98463778f4fe526dcd (patch) | |
| tree | b8ec3de5a7ec029904d653975eda3cfd11e648ba | |
| parent | 6fa19f5637a6c22bc0999596bcc83bdcac8a4fa6 (diff) | |
| parent | 34aaaac815d166daef361f49529f4c6b77da49f1 (diff) | |
| download | linux-da0e51716646b8ca2aa91a98463778f4fe526dcd.tar.bz2 | |
Merge branch 'ieee802154-for-davem-2019-01-31' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan
Stefan Schmidt says:
====================
pull-request: ieee802154 for net 2019-01-31
An update from ieee802154 for your *net* tree.
I waited a while to see if anything else comes up, but it seems this time
we only have one fixup patch for the -rc rounds.
Colin fixed some indentation in the mcr20a drivers. That's about it.
If there are any problems with taking these two before the final 5.0 let
me know.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ieee802154/mcr20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c index 44de81e5f140..c589f5ae75bb 100644 --- a/drivers/net/ieee802154/mcr20a.c +++ b/drivers/net/ieee802154/mcr20a.c @@ -905,9 +905,9 @@ mcr20a_irq_clean_complete(void *context) } break; case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_SEQIRQ): - /* rx is starting */ - dev_dbg(printdev(lp), "RX is starting\n"); - mcr20a_handle_rx(lp); + /* rx is starting */ + dev_dbg(printdev(lp), "RX is starting\n"); + mcr20a_handle_rx(lp); break; case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_TXIRQ | DAR_IRQSTS1_SEQIRQ): if (lp->is_tx) { |