Merge "msm: camera: Correct the NULL check" into dev/msm-4.9-camx