renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
Code

charger-manager: Fix a bug when it unregisters notifier block of extcon

Browse Source 
This patch prevents NULL pointer error cauesed by unregistering
unregistered exton notifier block. At the probing time of charger manager,
it tries to remove extcon notifier block when it fails to initialize them.
It has to be applied for only registered one. Otherwise, it'd make kernel
panic. To make it work right, it checks extcon_specific_cable_nb's
extcon_dev node. If extcon cable notifier block was registered
successfully, it has proper extcon_dev pointer if not so it has NULL
pointer.

Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
This commit is contained in:
Jonghwa Lee 2013-06-25 14:02:49 +09:00 committed by Anton Vorontsov
parent 605860bc24
commit 3cc9d26966
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/power/charger-manager.c
View File

@ -1666,7 +1666,9 @@ err_reg_extcon:
charger = &desc->charger_regulators[i]; charger = &desc->charger_regulators[i];
for (j = 0; j < charger->num_cables; j++) { for (j = 0; j < charger->num_cables; j++) {
struct charger_cable *cable = &charger->cables[j]; struct charger_cable *cable = &charger->cables[j];
extcon_unregister_interest(&cable->extcon_dev); /* Remove notifier block if only edev exists */
if (cable->extcon_dev.edev)
extcon_unregister_interest(&cable->extcon_dev);
} }
regulator_put(desc->charger_regulators[i].consumer); regulator_put(desc->charger_regulators[i].consumer);