summaryrefslogtreecommitdiff
path: root/drivers/net/ieee802154
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2020-08-04 10:58:32 +0300
committerJoel Stanley <joel@jms.id.au>2020-08-04 10:58:36 +0300
commit9524588381df213554a10d3661a9200a4b7f6db2 (patch)
treea4d281b99dcd28b9a1d3077299c26a5671abff88 /drivers/net/ieee802154
parent666e403461fd046b37bc95bba49e82ca6a758bea (diff)
parent67da9e2c2b730b9b788ace749d22d769cf11ee2b (diff)
downloadlinux-dev-5.7.tar.xz
Merge tag 'v5.7.12' into dev-5.7dev-5.7
This is the 5.7.12 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/net/ieee802154')
-rw-r--r--drivers/net/ieee802154/adf7242.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c
index 5a37514e4234..8dbccec6ac86 100644
--- a/drivers/net/ieee802154/adf7242.c
+++ b/drivers/net/ieee802154/adf7242.c
@@ -1262,7 +1262,7 @@ static int adf7242_probe(struct spi_device *spi)
WQ_MEM_RECLAIM);
if (unlikely(!lp->wqueue)) {
ret = -ENOMEM;
- goto err_hw_init;
+ goto err_alloc_wq;
}
ret = adf7242_hw_init(lp);
@@ -1294,6 +1294,8 @@ static int adf7242_probe(struct spi_device *spi)
return ret;
err_hw_init:
+ destroy_workqueue(lp->wqueue);
+err_alloc_wq:
mutex_destroy(&lp->bmux);
ieee802154_free_hw(lp->hw);