diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 14:50:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 14:50:28 +1100 |
| commit | 9b4376bdd4ee15dc8fcbae1d751fd0d36286c81e (patch) | |
| tree | b96012a13fdd93e65b8568411f767c2caf0cf367 | |
| parent | 25abca115f1f959ba1148c0ca2910a3b54d88f47 (diff) | |
| parent | 5324dc0e3872324ed0bf372bce7bc437436910b6 (diff) | |
Merge remote branch 'battery/master'
| -rw-r--r-- | drivers/power/da9030_battery.c | 2 | ||||
| -rw-r--r-- | drivers/power/wm97xx_battery.c | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/drivers/power/da9030_battery.c b/drivers/power/da9030_battery.c index 3364198134a1..a2e71f7b27fb 100644 --- a/drivers/power/da9030_battery.c +++ b/drivers/power/da9030_battery.c @@ -509,7 +509,7 @@ static int da9030_battery_probe(struct platform_device *pdev) charger->master = pdev->dev.parent; - /* 10 seconds between monotor runs unless platfrom defines other + /* 10 seconds between monitor runs unless platform defines other interval */ charger->interval = msecs_to_jiffies( (pdata->batmon_interval ? : 10) * 1000); diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index fa39e759a275..23eed356a854 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c @@ -26,7 +26,7 @@ static DEFINE_MUTEX(bat_lock); static struct work_struct bat_work; -struct mutex work_lock; +static struct mutex work_lock; static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN; static struct wm97xx_batt_info *gpdata; static enum power_supply_property *prop; @@ -175,8 +175,14 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev) dev_err(&dev->dev, "Do not pass platform_data through " "wm97xx_bat_set_pdata!\n"); return -EINVAL; - } else - pdata = wmdata->batt_pdata; + } + + if (!wmdata) { + dev_err(&dev->dev, "No platform data supplied\n"); + return -EINVAL; + } + + pdata = wmdata->batt_pdata; if (dev->id != -1) return -EINVAL; @@ -197,7 +203,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev) goto err2; ret = request_irq(gpio_to_irq(pdata->charge_gpio), wm97xx_chrg_irq, IRQF_DISABLED, - "AC Detect", 0); + "AC Detect", dev); if (ret) goto err2; props++; /* POWER_SUPPLY_PROP_STATUS */ |