Merge "msm: camera: Fix for kernel panic"