Merge "msm: camera: Fix couple of error cases." into msm-3.0