Merge "msm: camera: Fix broken error handling"