mirror of
https://github.com/torvalds/linux.git
synced 2026-05-21 21:37:25 +02:00
power: supply: ab8500_fg: add missing destroy_workqueue in ab8500_fg_probe
In ab8500_fg_probe, misses destroy_workqueue in error path, this patch
fixes that.
Fixes: 010ddb813f ("power: supply: ab8500_fg: Allocate wq in probe")
Signed-off-by: Gao Chao <gaochao49@huawei.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
parent
f2906aa863
commit
0f5de2f053
|
|
@ -3148,6 +3148,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|||
ret = ab8500_fg_init_hw_registers(di);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to initialize registers\n");
|
||||
destroy_workqueue(di->fg_wq);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -3159,6 +3160,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|||
di->fg_psy = devm_power_supply_register(dev, &ab8500_fg_desc, &psy_cfg);
|
||||
if (IS_ERR(di->fg_psy)) {
|
||||
dev_err(dev, "failed to register FG psy\n");
|
||||
destroy_workqueue(di->fg_wq);
|
||||
return PTR_ERR(di->fg_psy);
|
||||
}
|
||||
|
||||
|
|
@ -3174,8 +3176,10 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|||
/* Register primary interrupt handlers */
|
||||
for (i = 0; i < ARRAY_SIZE(ab8500_fg_irq); i++) {
|
||||
irq = platform_get_irq_byname(pdev, ab8500_fg_irq[i].name);
|
||||
if (irq < 0)
|
||||
if (irq < 0) {
|
||||
destroy_workqueue(di->fg_wq);
|
||||
return irq;
|
||||
}
|
||||
|
||||
ret = devm_request_threaded_irq(dev, irq, NULL,
|
||||
ab8500_fg_irq[i].isr,
|
||||
|
|
@ -3185,6 +3189,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|||
if (ret != 0) {
|
||||
dev_err(dev, "failed to request %s IRQ %d: %d\n",
|
||||
ab8500_fg_irq[i].name, irq, ret);
|
||||
destroy_workqueue(di->fg_wq);
|
||||
return ret;
|
||||
}
|
||||
dev_dbg(dev, "Requested %s IRQ %d: %d\n",
|
||||
|
|
@ -3200,6 +3205,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|||
ret = ab8500_fg_sysfs_init(di);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to create sysfs entry\n");
|
||||
destroy_workqueue(di->fg_wq);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -3207,6 +3213,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|||
if (ret) {
|
||||
dev_err(dev, "failed to create FG psy\n");
|
||||
ab8500_fg_sysfs_exit(di);
|
||||
destroy_workqueue(di->fg_wq);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user