Merge "msm: pm-8x60: Fix incorrect check for freeing memory on error" into msm-3.0