Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 06:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

pda_power: only register available psu

Browse Source 
Currently pda-power adds both ac and usb power supply units.
This patch fixes it so that psu are added only if they are enabled.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Anton Vorontsov <cbou@mail.ru>
This commit is contained in:
Dmitry Baryshkov 2008-01-07 04:12:39 +03:00 committed by Anton Vorontsov
parent 839dc9f105
commit 9ef4510626
1 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
drivers/power/pda_power.c
View File

@ -168,66 +168,74 @@ static int pda_power_probe(struct platform_device *pdev)
pda_power_supplies[1].num_supplicants = pdata->num_supplicants; pda_power_supplies[1].num_supplicants = pdata->num_supplicants;
} }
ret = power_supply_register(&pdev->dev, &pda_power_supplies[0]); if (pdata->is_ac_online) {
if (ret) { ret = power_supply_register(&pdev->dev, &pda_power_supplies[0]);
dev_err(dev, "failed to register %s power supply\n",
pda_power_supplies[0].name);
goto supply0_failed;
}
ret = power_supply_register(&pdev->dev, &pda_power_supplies[1]);
if (ret) {
dev_err(dev, "failed to register %s power supply\n",
pda_power_supplies[1].name);
goto supply1_failed;
}
if (ac_irq) {
ret = request_irq(ac_irq->start, power_changed_isr,
get_irq_flags(ac_irq), ac_irq->name,
&pda_power_supplies[0]);
if (ret) { if (ret) {
dev_err(dev, "request ac irq failed\n"); dev_err(dev, "failed to register %s power supply\n",
goto ac_irq_failed; pda_power_supplies[0].name);
goto ac_supply_failed;
}
if (ac_irq) {
ret = request_irq(ac_irq->start, power_changed_isr,
get_irq_flags(ac_irq), ac_irq->name,
&pda_power_supplies[0]);
if (ret) {
dev_err(dev, "request ac irq failed\n");
goto ac_irq_failed;
}
} }
} }
if (usb_irq) { if (pdata->is_usb_online) {
ret = request_irq(usb_irq->start, power_changed_isr, ret = power_supply_register(&pdev->dev, &pda_power_supplies[1]);
get_irq_flags(usb_irq), usb_irq->name,
&pda_power_supplies[1]);
if (ret) { if (ret) {
dev_err(dev, "request usb irq failed\n"); dev_err(dev, "failed to register %s power supply\n",
goto usb_irq_failed; pda_power_supplies[1].name);
goto usb_supply_failed;
}
if (usb_irq) {
ret = request_irq(usb_irq->start, power_changed_isr,
get_irq_flags(usb_irq),
usb_irq->name,
&pda_power_supplies[1]);
if (ret) {
dev_err(dev, "request usb irq failed\n");
goto usb_irq_failed;
}
} }
} }
goto success; return 0;
usb_irq_failed: usb_irq_failed:
if (ac_irq) if (pdata->is_usb_online)
power_supply_unregister(&pda_power_supplies[1]);
usb_supply_failed:
if (pdata->is_ac_online && ac_irq)
free_irq(ac_irq->start, &pda_power_supplies[0]); free_irq(ac_irq->start, &pda_power_supplies[0]);
ac_irq_failed: ac_irq_failed:
power_supply_unregister(&pda_power_supplies[1]); if (pdata->is_ac_online)
supply1_failed: power_supply_unregister(&pda_power_supplies[0]);
power_supply_unregister(&pda_power_supplies[0]); ac_supply_failed:
supply0_failed:
noirqs: noirqs:
wrongid: wrongid:
success:
return ret; return ret;
} }
static int pda_power_remove(struct platform_device *pdev) static int pda_power_remove(struct platform_device *pdev)
{ {
if (usb_irq) if (pdata->is_usb_online && usb_irq)
free_irq(usb_irq->start, &pda_power_supplies[1]); free_irq(usb_irq->start, &pda_power_supplies[1]);
if (ac_irq) if (pdata->is_ac_online && ac_irq)
free_irq(ac_irq->start, &pda_power_supplies[0]); free_irq(ac_irq->start, &pda_power_supplies[0]);
del_timer_sync(&charger_timer); del_timer_sync(&charger_timer);
del_timer_sync(&supply_timer); del_timer_sync(&supply_timer);
power_supply_unregister(&pda_power_supplies[1]); if (pdata->is_usb_online)
power_supply_unregister(&pda_power_supplies[0]); power_supply_unregister(&pda_power_supplies[1]);
if (pdata->is_ac_online)
power_supply_unregister(&pda_power_supplies[0]);
return 0; return 0;
} }