| commit | fcb388ce6c293b36a71a24c0bfe526c13774302a | |
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | |
| Tue, 22 Jul 2014 19:25:33 +0000 (22 16:25 -0300) | ||
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | |
| Tue, 22 Jul 2014 23:38:13 +0000 (22 20:38 -0300) | ||
| tree | f164b9eed1217d16a1b94d3dea5c20721b2a733f | treesnapshot (tar.gz zip) |
| parent | e23cf7f358554139a7c9f0d2739eec187599c670 | commitdiff |
[media] si2168: Fix a badly solved merge conflict
changeset a733291d6934 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>
changeset a733291d6934 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>
| drivers/media/dvb-frontends/si2168.c | diffblobblamehistory |