drivers: more fixes for camera

Commented out a few lines Nick missed, adapted from msm8660 kernel

Change-Id: I1577b591fa4484a9537c6f307eb02d462cac240f