summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorsyed rafiuddin <srafiuddin@nvidia.com>2011-10-07 14:16:40 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:50:15 -0800
commit5dc7e80087f5176331f912584459c03427b15ccb (patch)
treeba2348479b39f1ad33a35419bab4f977bb12c1dc /drivers/power
parent014d6c9847cd1530c4e449ae497cc0307357c0e9 (diff)
power: tps80031-battery: Exit driver if battery is not detected
Exit fuel-gauge driver if battery presence is not detected. bug 873965 Reviewed-on: http://git-master/r/61830 (cherry picked from commit 149469646e1e5e7ece787ef9546de60a97b46802) Change-Id: I00139f1a92822875fb1409a918c580b83d4789f0 Reviewed-on: http://git-master/r/64090 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: Rebb08c9d9cbe6a3bb2a3bcaf4cc89beceb55c480
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/tps80031_battery_gauge.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/power/tps80031_battery_gauge.c b/drivers/power/tps80031_battery_gauge.c
index 19a07970f9dd..5895c476c84a 100644
--- a/drivers/power/tps80031_battery_gauge.c
+++ b/drivers/power/tps80031_battery_gauge.c
@@ -420,6 +420,12 @@ static int tps80031_battery_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ if (!pdata->battery_present) {
+ dev_err(dev, "%s() No battery detected, exiting..\n",
+ __func__);
+ return -ENODEV;
+ }
+
di->dev = &pdev->dev;
ret = tps80031_reg_read(di, SLAVE_ID2, CONTROLLER_STAT1, &retval);