diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-27 10:54:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-27 10:54:20 -0800 |
| commit | 3ebd3da699731929af8ef879001c8c38d1817211 (patch) | |
| tree | b037364e95fe0e70410aee8dfa86467a87b3e819 | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs (diff) | |
| parent | pwm: lp3943: Fix potential memory leak during request (diff) | |
| download | wireguard-linux-3ebd3da699731929af8ef879001c8c38d1817211.tar.xz wireguard-linux-3ebd3da699731929af8ef879001c8c38d1817211.zip | |
Merge tag 'pwm/for-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm fix from Thierry Reding:
"Just a single trivial patch to plug a memory leak in an error path"
* tag 'pwm/for-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
pwm: lp3943: Fix potential memory leak during request
| -rw-r--r-- | drivers/pwm/pwm-lp3943.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-lp3943.c b/drivers/pwm/pwm-lp3943.c index 8a843a04c224..a40b9c34e9ff 100644 --- a/drivers/pwm/pwm-lp3943.c +++ b/drivers/pwm/pwm-lp3943.c @@ -52,8 +52,10 @@ lp3943_pwm_request_map(struct lp3943_pwm *lp3943_pwm, int hwpwm) offset = pwm_map->output[i]; /* Return an error if the pin is already assigned */ - if (test_and_set_bit(offset, &lp3943->pin_used)) + if (test_and_set_bit(offset, &lp3943->pin_used)) { + kfree(pwm_map); return ERR_PTR(-EBUSY); + } } return pwm_map; |