Mauro Carvalho Chehab fcb388ce6c [media] si2168: Fix a badly solved merge conflict ...

changeset a733291d69 didn't merge the fixes well. It ended by
restoring some bad logic removed there.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

2014-07-22 20:38:13 -03:00

15 KiB

Raw Blame History

View Raw