diff options
| author | Zhou Jingyu <b02241@freescale.com> | 2010-09-25 15:04:49 +0800 |
|---|---|---|
| committer | Alan Tull <r80115@freescale.com> | 2010-09-25 09:53:58 -0500 |
| commit | 27d19e5176a0b235a610d9de564f424d484c4f9b (patch) | |
| tree | 13352f3b5e386d176e439219e5cfd33c7999a4dc /drivers/mxc | |
| parent | 463b2ceb56c105dbd50ac9ff625bf9b7bc74efd6 (diff) | |
ENGR00131911 fix mc13892 battery probe failure on 2.6.35 kernel
Fix mc13892 battery probe failure on 2.6.35 kernel
Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
Diffstat (limited to 'drivers/mxc')
| -rw-r--r-- | drivers/mxc/pmic/mc13892/pmic_battery.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/drivers/mxc/pmic/mc13892/pmic_battery.c b/drivers/mxc/pmic/mc13892/pmic_battery.c index 75fcf2595004..d26117e02ebe 100644 --- a/drivers/mxc/pmic/mc13892/pmic_battery.c +++ b/drivers/mxc/pmic/mc13892/pmic_battery.c @@ -436,7 +436,8 @@ static void mc13892_battery_update_status(struct mc13892_dev_info *di) dev_dbg(di->bat.dev, "bat status: %d\n", di->battery_status); - if (di->battery_status != old_battery_status) + if (old_battery_status != POWER_SUPPLY_STATUS_UNKNOWN && + di->battery_status != old_battery_status) power_supply_changed(&di->bat); } @@ -550,21 +551,6 @@ static int pmic_battery_probe(struct platform_device *pdev) platform_set_drvdata(pdev, di); - di->dev = &pdev->dev; - di->bat.name = "mc13892_bat"; - di->bat.type = POWER_SUPPLY_TYPE_BATTERY; - di->bat.properties = mc13892_battery_props; - di->bat.num_properties = ARRAY_SIZE(mc13892_battery_props); - di->bat.get_property = mc13892_battery_get_property; - di->bat.use_for_apm = 1; - - di->battery_status = POWER_SUPPLY_STATUS_UNKNOWN; - - retval = power_supply_register(&pdev->dev, &di->bat); - if (retval) { - dev_err(di->dev, "failed to register battery\n"); - goto batt_failed; - } di->charger.name = "mc13892_charger"; di->charger.type = POWER_SUPPLY_TYPE_MAINS; di->charger.properties = mc13892_charger_props; @@ -583,6 +569,22 @@ static int pmic_battery_probe(struct platform_device *pdev) } queue_delayed_work(di->monitor_wqueue, &di->monitor_work, HZ * 10); + di->dev = &pdev->dev; + di->bat.name = "mc13892_bat"; + di->bat.type = POWER_SUPPLY_TYPE_BATTERY; + di->bat.properties = mc13892_battery_props; + di->bat.num_properties = ARRAY_SIZE(mc13892_battery_props); + di->bat.get_property = mc13892_battery_get_property; + di->bat.use_for_apm = 1; + + di->battery_status = POWER_SUPPLY_STATUS_UNKNOWN; + + retval = power_supply_register(&pdev->dev, &di->bat); + if (retval) { + dev_err(di->dev, "failed to register battery\n"); + goto batt_failed; + } + bat_event_callback.func = charger_online_event_callback; bat_event_callback.param = (void *) di; pmic_event_subscribe(EVENT_CHGDETI, bat_event_callback); |