lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'pwm/for-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

Browse Source 
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
This commit is contained in:
Linus Torvalds
2014-02-27 10:54:20 -08:00
parent 8d7531825c 0b7d25c347
commit 3ebd3da699
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pwm/pwm-lp3943.c
View File

@@ -52,8 +52,10 @@ lp3943_pwm_request_map(struct lp3943_pwm *lp3943_pwm, int hwpwm)
offset = pwm_map->output[i]; offset = pwm_map->output[i];
/* Return an error if the pin is already assigned */ /* 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 ERR_PTR(-EBUSY);
}
} }
return pwm_map; return pwm_map;