Merge "msm: camera: Fix possible NULL pointer dereference."