Merge "power: qpnp-smbcharger: Fix error path" into msm-4.9