diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2013-06-18 12:52:49 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:31:22 -0700 |
| commit | 7872d77e744946ca215b934f0b831892c612c6c8 (patch) | |
| tree | f35faf1849953c045e460bb4ded51e87bda1cdaf /drivers/power/palmas-charger.c | |
| parent | 1ee1b38096a7e50f204810ebba6eba935acde1a6 (diff) | |
power: palmas-charger: disable WDT if battery not connected
WDT is needed mainly when the charging functionality is enabled
and this happen only when battery connected.
If battery not connected then disable WDT.
bug 1307260
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/239621
(cherry picked from commit 9714c462824735213ba06605cb9d850fe54a0d18)
Change-Id: Ib1622d5cb782136df5a353dd8d71081d676ef922
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/248384
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/power/palmas-charger.c')
| -rw-r--r-- | drivers/power/palmas-charger.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/power/palmas-charger.c b/drivers/power/palmas-charger.c index e712f4a8a74e..4193ddb5f3e7 100644 --- a/drivers/power/palmas-charger.c +++ b/drivers/power/palmas-charger.c @@ -847,6 +847,12 @@ static int palmas_probe(struct platform_device *pdev) if (!pdata->bcharger_pdata) { dev_info(&pdev->dev, "No battery charger supported\n"); + ret = palmas_watchdog_init(palmas_chip, 0, "PROBE"); + if (ret < 0) { + dev_err(palmas_chip->dev, + "WDT disable failed: %d\n", ret); + goto scrub_mutex; + } goto skip_bcharger_init; } palmas_chip->battery_presense = true; |