leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: supply: bq24190_charger: Install irq_handler_thread() at end of probe()

Browse Source 
The device specific data is not fully initialized on
request_threaded_irq(). This may cause a crash when the IRQ handler
tries to reference them.

Fix the issue by installing IRQ handler at the end of the probe.

Fixes: d7bf353fd0 ("bq24190_charger: Add support for TI BQ24190 Battery Charger")
Signed-off-by: Liam Breck <kernel@networkimprov.net>
Acked-by: Mark Greer <mgreer@animalcreek.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Liam Breck 2017-01-18 09:26:50 -08:00 committed by Sebastian Reichel
parent e05ad7e074
commit d62acc5ef0
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/power/supply/bq24190_charger.c
View File

@ -1392,22 +1392,13 @@ static int bq24190_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
ret = devm_request_threaded_irq(dev, bdi->irq, NULL,
bq24190_irq_handler_thread,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"bq24190-charger", bdi);
if (ret < 0) {
dev_err(dev, "Can't set up irq handler\n");
goto out1;
}
pm_runtime_enable(dev); pm_runtime_enable(dev);
pm_runtime_resume(dev); pm_runtime_resume(dev);
ret = bq24190_hw_init(bdi); ret = bq24190_hw_init(bdi);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Hardware init failed\n"); dev_err(dev, "Hardware init failed\n");
goto out2; goto out1;
} }
charger_cfg.drv_data = bdi; charger_cfg.drv_data = bdi;
@ -1418,7 +1409,7 @@ static int bq24190_probe(struct i2c_client *client,
if (IS_ERR(bdi->charger)) { if (IS_ERR(bdi->charger)) {
dev_err(dev, "Can't register charger\n"); dev_err(dev, "Can't register charger\n");
ret = PTR_ERR(bdi->charger); ret = PTR_ERR(bdi->charger);
goto out2; goto out1;
} }
battery_cfg.drv_data = bdi; battery_cfg.drv_data = bdi;
@ -1427,24 +1418,34 @@ static int bq24190_probe(struct i2c_client *client,
if (IS_ERR(bdi->battery)) { if (IS_ERR(bdi->battery)) {
dev_err(dev, "Can't register battery\n"); dev_err(dev, "Can't register battery\n");
ret = PTR_ERR(bdi->battery); ret = PTR_ERR(bdi->battery);
goto out3; goto out2;
} }
ret = bq24190_sysfs_create_group(bdi); ret = bq24190_sysfs_create_group(bdi);
if (ret) { if (ret) {
dev_err(dev, "Can't create sysfs entries\n"); dev_err(dev, "Can't create sysfs entries\n");
goto out3;
}
ret = devm_request_threaded_irq(dev, bdi->irq, NULL,
bq24190_irq_handler_thread,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"bq24190-charger", bdi);
if (ret < 0) {
dev_err(dev, "Can't set up irq handler\n");
goto out4; goto out4;
} }
return 0; return 0;
out4: out4:
power_supply_unregister(bdi->battery); bq24190_sysfs_remove_group(bdi);
out3: out3:
power_supply_unregister(bdi->charger); power_supply_unregister(bdi->battery);
out2: out2:
pm_runtime_disable(dev); power_supply_unregister(bdi->charger);
out1: out1:
pm_runtime_disable(dev);
if (bdi->gpio_int) if (bdi->gpio_int)
gpio_free(bdi->gpio_int); gpio_free(bdi->gpio_int);