[media] si2168: Fix a badly solved merge conflict

Browse source

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>

...

This commit is contained in:

Mauro Carvalho Chehab 2014-07-22 16:25:33 -03:00

parent e23cf7f358

commit fcb388ce6c

1 changed files with 0 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

drivers/media/dvb-frontends/si2168.c

View file