drivers: media: fix mis-merge

Change-Id: If2d8369f9543187e8d1ecc766289c8599b6fd00f
Reset camera driver with non-gpe source

Change-Id: I6e1008bb423bfa9b7effa4bec14e86baa55f4cb6