evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qcom-charger: Fix crash due to null ptr access of pl psy"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-09 01:32:10 -08:00 • committed by Gerrit - the friendly Code Review server
commit 69fd33f749
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/power/qcom-charger/qpnp-smb2.c
View file

@ -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",