diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-22 11:26:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-22 11:26:58 -0700 |
| commit | 915edd9d973ae3bc77c166038d3dacfd501ee3c2 (patch) | |
| tree | 6a790eb4d12ef90e81571ec1fdbffd41a2d7ed73 /drivers/power | |
| parent | 078e8404c16e447fe1eaed44ff203742eaddb921 (diff) | |
| parent | bc2dcbfae6262d98c7d8fe9a0401a783816f8deb (diff) | |
Merge "smb1351-charger: Fix possible Null pointer dereference"
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/qcom-charger/smb1351-charger.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/power/qcom-charger/smb1351-charger.c b/drivers/power/qcom-charger/smb1351-charger.c index 0f18844b9afa..79fbe33acf5d 100644 --- a/drivers/power/qcom-charger/smb1351-charger.c +++ b/drivers/power/qcom-charger/smb1351-charger.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015 The Linux Foundation. All rights reserved. +/* Copyright (c) 2016 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1872,6 +1872,12 @@ static void smb1351_chg_adc_notification(enum qpnp_tm_state state, void *ctx) } } + if (!cur) { + pr_debug("Couldn't choose batt state, adc state=%d and temp=%d\n", + state, temp); + return; + } + if (cur->batt_present) chip->battery_missing = false; else |