Merge "qcom-charger: Fix crash due to null ptr access of pl psy" (69fd33f7) · Commits · e / devices / android_kernel_sony_msm8998

drivers/power/qcom-charger/qpnp-smb2.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1884,6 +1884,12 @@ static int smb2_probe(struct platform_device *pdev)
		goto cleanup;
		}

		rc = smb2_init_hw(chip);
		if (rc < 0) {
		pr_err("Couldn't initialize hardware rc=%d\n", rc);
		goto cleanup;
		}

		rc = smb2_init_dc_psy(chip);
		if (rc < 0) {
		pr_err("Couldn't initialize dc psy rc=%d\n", rc);
		@@ -1916,12 +1922,6 @@ static int smb2_probe(struct platform_device *pdev)
		goto cleanup;
		}

		rc = smb2_init_hw(chip);
		if (rc < 0) {
		pr_err("Couldn't initialize hardware rc=%d\n", rc);
		goto cleanup;
		}

		rc = smb2_determine_initial_status(chip);
		if (rc < 0) {
		pr_err("Couldn't determine initial status rc=%d\n",