diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-31 16:56:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-31 16:56:43 -0400 |
| commit | 0b70195e0c3206103be991e196c26fcf168d0334 (patch) | |
| tree | 61902c09bfa14034a82c151f46a4616a2f013653 /drivers/net/ieee802154 | |
| parent | ce22bb6122e849e0d3a6857d03eb69a25bfdc6e9 (diff) | |
| parent | 17e84a9253467552fb06f99c009bb0bc1d7bfd39 (diff) | |
| download | op-kernel-dev-0b70195e0c3206103be991e196c26fcf168d0334.zip op-kernel-dev-0b70195e0c3206103be991e196c26fcf168d0334.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/xen-netback/netback.c
A bug fix overlapped with changing how the netback SKB control
block is implemented.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ieee802154')
| -rw-r--r-- | drivers/net/ieee802154/at86rf230.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index e8004ef..89417ac 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -1249,6 +1249,8 @@ static int at86rf230_remove(struct spi_device *spi) struct at86rf230_local *lp = spi_get_drvdata(spi); struct at86rf230_platform_data *pdata = spi->dev.platform_data; + /* mask all at86rf230 irq's */ + at86rf230_write_subreg(lp, SR_IRQ_MASK, 0); ieee802154_unregister_device(lp->dev); free_irq(spi->irq, lp); |
