Merge "power: qpnp-bms: fix unbalanced IRQs in qpnp-bms.c" (5abf1aa9) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qpnp-bms.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -4307,6 +4307,12 @@ static int qpnp_bms_probe(struct spmi_device *spmi)
		goto error_setup;
		}

		rc = bms_request_irqs(chip);
		if (rc) {
		pr_err("error requesting bms irqs, rc = %d\n", rc);
		goto error_setup;
		}

		battery_insertion_check(chip);
		batfet_status_check(chip);
		battery_status_check(chip);
		@@ -4340,12 +4346,6 @@ static int qpnp_bms_probe(struct spmi_device *spmi)
		goto unregister_dc;
		}

		rc = bms_request_irqs(chip);
		if (rc) {
		pr_err("error requesting bms irqs, rc = %d\n", rc);
		goto unregister_dc;
		}

		pr_info("probe success: soc =%d vbatt = %d ocv = %d r_sense_uohm = %u warm_reset = %d\n",
		get_prop_bms_capacity(chip), vbatt, chip->last_ocv_uv,
		chip->r_sense_uohm, warm_reset);