Skip to content

Commit

Permalink
Merge tag 'ieee802154-for-davem-2020-07-20' of git://git.kernel.org/p…
Browse files Browse the repository at this point in the history
…ub/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>
  • Loading branch information
David S. Miller committed Jul 21, 2020
2 parents 53a9288 + 19dc365 commit 7d85396
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/net/ieee802154/adf7242.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Copyright 2009-2017 Analog Devices Inc.
*
* http://www.analog.com/ADF7242
* https://www.analog.com/ADF7242
*/

#include <linux/kernel.h>
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 7d85396

Please sign in to comment.