diff options
author | Devin Kim <dojip.kim@lge.com> | 2016-08-25 12:46:42 -0700 |
---|---|---|
committer | Devin Kim <dojip.kim@lge.com> | 2016-08-26 10:38:36 -0700 |
commit | 9badb4e65fa9856084cfee2342adf4b8ec74126b (patch) | |
tree | ab4eef98b8ebe3dedb5c8b74277aeacd640fd98a | |
parent | 018e39462f9d14526006984cb7f0abb4e6750b75 (diff) |
charger-dock: Change the order of the registration to avoid NPEandroid-wear-6.0.1_r0.75
NPE will occur if calling switch_set_state() in dock_external_power_changed()
before the registration of swtich driver
Bug: 31085909
Change-Id: Iaea1c40d0ff73967dce2b66e5f7ca61b79c658bb
Signed-off-by: Devin Kim <dojip.kim@lge.com>
-rw-r--r-- | drivers/power/charger-dock.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/power/charger-dock.c b/drivers/power/charger-dock.c index 6dff3412bb78..50d41a98258a 100644 --- a/drivers/power/charger-dock.c +++ b/drivers/power/charger-dock.c @@ -81,40 +81,40 @@ static int dock_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dock_dev); - dock_dev->psy.name = "dock"; - dock_dev->psy.type = POWER_SUPPLY_TYPE_UNKNOWN; - dock_dev->psy.get_property = dock_get_property; - dock_dev->psy.external_power_changed = dock_external_power_changed; - - ret = power_supply_register(&pdev->dev, &dock_dev->psy); - if (ret) { - pr_err("%s: failed power supply register\n", __func__); - return ret; - } - dock_dev->sdev = devm_kzalloc(&pdev->dev, sizeof(*dock_dev->sdev), GFP_KERNEL); - if (!dock_dev) { + if (!dock_dev->sdev) { pr_err("%s: failed to alloc switch device\n", __func__); - ret = -ENOMEM; - goto err_switch; + return -ENOMEM; } dock_dev->sdev->name = "dock"; ret = switch_dev_register(dock_dev->sdev); if (ret < 0) { pr_err("%s: failed to register switch device\n", __func__); - goto err_switch; + return ret; } wake_lock_init(&dock_dev->wakelock, WAKE_LOCK_SUSPEND, "docked-state-uevent"); + dock_dev->psy.name = "dock"; + dock_dev->psy.type = POWER_SUPPLY_TYPE_UNKNOWN; + dock_dev->psy.get_property = dock_get_property; + dock_dev->psy.external_power_changed = dock_external_power_changed; + + ret = power_supply_register(&pdev->dev, &dock_dev->psy); + if (ret) { + pr_err("%s: failed power supply register\n", __func__); + goto err_power_supply_register; + } + dock_external_power_changed(&dock_dev->psy); return 0; -err_switch: - power_supply_unregister(&dock_dev->psy); +err_power_supply_register: + wake_lock_destroy(&dock_dev->wakelock); + switch_dev_unregister(dock_dev->sdev); platform_set_drvdata(pdev, NULL); return ret; } @@ -123,9 +123,9 @@ static int dock_remove(struct platform_device *pdev) { struct dock_device *dock_dev = platform_get_drvdata(pdev); + power_supply_unregister(&dock_dev->psy); wake_lock_destroy(&dock_dev->wakelock); switch_dev_unregister(dock_dev->sdev); - power_supply_unregister(&dock_dev->psy); platform_set_drvdata(pdev, NULL); return 0; } |