drivers: video: msm: cleanup mismerge

Change-Id: Iad5e80127c4ca697bd5a5fb68403ebd714761ef5