summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorRickard Andersson <rickard.andersson@stericsson.com>2011-09-13 18:31:12 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 08:51:03 +0100
commitc176542face40b64ead741f53d565833788a18e8 (patch)
tree81ee88a7e5901ab6a69ca87a89f493d3a4dba235 /drivers/power
parentf4d01cfc3a307b038cd35b91f006f0bef0b7617e (diff)
mfd:ab8500-core: Possible to disable battery management
This patch makes it possible to disable battery management via a module boot parameter. When 'ab8500-core.no_bm=1' then ab8500_btemp, ab8500_chargalg, ab8500_charger and ab8500_fg will not be probed. ST-Ericsson ID: 336205 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: Iec69e3353024dfab738301335915d5d798948b93 Signed-off-by: Rickard Andersson <rickard.andersson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/36353 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_charger.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index a09c28e2fea..0704395ff42 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2330,6 +2330,9 @@ static int ab8500_charger_usb_notifier_call(struct notifier_block *nb,
else /* Should never occur */
bm_usb_state = AB8500_BM_USB_STATE_RESET_FS;
+ if (di == NULL)
+ return;
+
dev_dbg(di->dev, "%s usb_state: 0x%02x mA: %d\n",
__func__, bm_usb_state, mA);