This reverts commit 2b016c47.

Wrong patch was merged, revert this first before applying the right
patch.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>