Commit 7d85396c authored by David S. Miller's avatar David S. Miller

Merge tag 'ieee802154-for-davem-2020-07-20' of...

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 53a92889 19dc3654
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* *
* Copyright 2009-2017 Analog Devices Inc. * Copyright 2009-2017 Analog Devices Inc.
* *
* http://www.analog.com/ADF7242 * https://www.analog.com/ADF7242
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -1262,7 +1262,7 @@ static int adf7242_probe(struct spi_device *spi) ...@@ -1262,7 +1262,7 @@ static int adf7242_probe(struct spi_device *spi)
WQ_MEM_RECLAIM); WQ_MEM_RECLAIM);
if (unlikely(!lp->wqueue)) { if (unlikely(!lp->wqueue)) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_hw_init; goto err_alloc_wq;
} }
ret = adf7242_hw_init(lp); ret = adf7242_hw_init(lp);
...@@ -1294,6 +1294,8 @@ static int adf7242_probe(struct spi_device *spi) ...@@ -1294,6 +1294,8 @@ static int adf7242_probe(struct spi_device *spi)
return ret; return ret;
err_hw_init: err_hw_init:
destroy_workqueue(lp->wqueue);
err_alloc_wq:
mutex_destroy(&lp->bmux); mutex_destroy(&lp->bmux);
ieee802154_free_hw(lp->hw); ieee802154_free_hw(lp->hw);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment