diff options
author | David S. Miller <davem@davemloft.net> | 2018-10-03 21:00:17 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-03 21:00:17 -0700 |
commit | 6f41617bf23a17d9cb7cc6ca8161534f05f80293 (patch) | |
tree | 2844d8d197a61b0603e31f09613e3272635dd1cc /drivers/net/ieee802154/adf7242.c | |
parent | Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (diff) | |
parent | Merge gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-dev-6f41617bf23a17d9cb7cc6ca8161534f05f80293.tar.xz linux-dev-6f41617bf23a17d9cb7cc6ca8161534f05f80293.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net'
overlapped the renaming of a netlink attribute in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ieee802154/adf7242.c')
-rw-r--r-- | drivers/net/ieee802154/adf7242.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c index 23a52b9293f3..cd1d8faccca5 100644 --- a/drivers/net/ieee802154/adf7242.c +++ b/drivers/net/ieee802154/adf7242.c @@ -1308,8 +1308,7 @@ static int adf7242_remove(struct spi_device *spi) { struct adf7242_local *lp = spi_get_drvdata(spi); - if (!IS_ERR_OR_NULL(lp->debugfs_root)) - debugfs_remove_recursive(lp->debugfs_root); + debugfs_remove_recursive(lp->debugfs_root); cancel_delayed_work_sync(&lp->work); destroy_workqueue(lp->wqueue); |