diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-23 05:44:14 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-23 05:44:14 -0800 |
| commit | ed9d7309bed439bd14d5740fa4fb6fe95e5f3afd (patch) | |
| tree | b7c6c6970646438857a14628d73b054afd274962 | |
| parent | bfa4ce7a09318bb7cb6674a5c2e4c8f0c1658364 (diff) | |
| parent | a933d67e3efa9899bb96e2a4e317727b4920a5d7 (diff) | |
Merge "power: smbcharger: Fix null pointer dereference error" into kernel.lnx.4.9.r12-relLA.UM.7.6.2.r1-04800-89xx.0
| -rw-r--r-- | drivers/power/supply/qcom/qpnp-smbcharger.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/power/supply/qcom/qpnp-smbcharger.c b/drivers/power/supply/qcom/qpnp-smbcharger.c index e9e080da6633..896509dac561 100644 --- a/drivers/power/supply/qcom/qpnp-smbcharger.c +++ b/drivers/power/supply/qcom/qpnp-smbcharger.c @@ -4043,6 +4043,11 @@ static void smbchg_chg_led_brightness_set(struct led_classdev *cdev, u8 reg; int rc; + if (!is_bms_psy_present(chip)) { + dev_err(chip->dev, "Couldn't access bms psy\n"); + return; + } + reg = (value > LED_OFF) ? CHG_LED_ON << CHG_LED_SHIFT : CHG_LED_OFF << CHG_LED_SHIFT; pval.intval = value > LED_OFF ? 1 : 0; @@ -4090,6 +4095,11 @@ static void smbchg_chg_led_blink_set(struct smbchg_chip *chip, u8 reg; int rc; + if (!is_bms_psy_present(chip)) { + dev_err(chip->dev, "Couldn't access bms psy\n"); + return; + } + pval.intval = (blinking == 0) ? 0 : 1; power_supply_set_property(chip->bms_psy, POWER_SUPPLY_PROP_HI_POWER, &pval); |