korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-26 20:44:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Input: lm8323 - fix error handling in lm8323_probe()

Browse Source 
We reuse the "i" variable later on so if we goto fail3 or fail4
then "i" will be set to the wrong thing and cause a crash.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dan Carpenter 2010-06-28 11:34:24 -07:00 committed by Dmitry Torokhov
parent 28ed684fa3
commit 1796b983cc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/input/keyboard/lm8323.c
View File

@ -642,6 +642,7 @@ static int __devinit lm8323_probe(struct i2c_client *client,
struct lm8323_platform_data *pdata = client->dev.platform_data; struct lm8323_platform_data *pdata = client->dev.platform_data;
struct input_dev *idev; struct input_dev *idev;
struct lm8323_chip *lm; struct lm8323_chip *lm;
int pwm;
int i, err; int i, err;
unsigned long tmo; unsigned long tmo;
u8 data[2]; u8 data[2];
@ -710,8 +711,9 @@ static int __devinit lm8323_probe(struct i2c_client *client,
goto fail1; goto fail1;
} }
for (i = 0; i < LM8323_NUM_PWMS; i++) { for (pwm = 0; pwm < LM8323_NUM_PWMS; pwm++) {
err = init_pwm(lm, i + 1, &client->dev, pdata->pwm_names[i]); err = init_pwm(lm, pwm + 1, &client->dev,
pdata->pwm_names[pwm]);
if (err < 0) if (err < 0)
goto fail2; goto fail2;
} }
@ -764,9 +766,9 @@ fail4:
fail3: fail3:
device_remove_file(&client->dev, &dev_attr_disable_kp); device_remove_file(&client->dev, &dev_attr_disable_kp);
fail2: fail2:
while (--i >= 0) while (--pwm >= 0)
if (lm->pwm[i].enabled) if (lm->pwm[pwm].enabled)
led_classdev_unregister(&lm->pwm[i].cdev); led_classdev_unregister(&lm->pwm[pwm].cdev);
fail1: fail1:
input_free_device(idev); input_free_device(idev);
kfree(lm); kfree(lm);