Merge "msm: camera: Add some error checks" into msm-3.0