diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-20 17:04:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-20 17:04:35 -0700 |
| commit | 7d85396c4c72de12df76d6b9853fd871dbfdf2ec (patch) | |
| tree | 1059f6657cfcfb057e5e3a993685c9903d409f29 | |
| parent | 53a92889ec0e6d968a7f4098a16031a672b6fd51 (diff) | |
| parent | 19dc36548be2027cb5a491511bc152493c1244bb (diff) | |
| download | linux-stable-7d85396c4c72de12df76d6b9853fd871dbfdf2ec.tar.gz linux-stable-7d85396c4c72de12df76d6b9853fd871dbfdf2ec.tar.bz2 linux-stable-7d85396c4c72de12df76d6b9853fd871dbfdf2ec.zip | |
Merge tag 'ieee802154-for-davem-2020-07-20' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan
Stefan Schmidt says:
====================
pull-request: ieee802154 for net 2020-07-20
An update from ieee802154 for your *net* tree.
A potential memory leak fix for adf7242 from Liu Jian,
and one more HTTPS link change from Alexander A. Klimov.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ieee802154/adf7242.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c index 5a37514e4234..c11f32f644db 100644 --- a/drivers/net/ieee802154/adf7242.c +++ b/drivers/net/ieee802154/adf7242.c @@ -4,7 +4,7 @@ * * Copyright 2009-2017 Analog Devices Inc. * - * http://www.analog.com/ADF7242 + * https://www.analog.com/ADF7242 */ #include <linux/kernel.h> @@ -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); |