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>
This commit is contained in:
commit
7d85396c4c
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user