Merge "power: smbcharger: Fix null pointer dereference error" into kernel.lnx.4.9.r12-rel (ed9d7309) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/power/supply/qcom/qpnp-smbcharger.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -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);