Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

-14
-14
drivers/media/dvb-frontends/si2168.c
··· 381 381 if (ret) 382 382 goto err; 383 383 384 - cmd.args[0] = 0x05; 385 - cmd.args[1] = 0x00; 386 - cmd.args[2] = 0xaa; 387 - cmd.args[3] = 0x4d; 388 - cmd.args[4] = 0x56; 389 - cmd.args[5] = 0x40; 390 - cmd.args[6] = 0x00; 391 - cmd.args[7] = 0x00; 392 - cmd.wlen = 8; 393 - cmd.rlen = 1; 394 - ret = si2168_cmd_execute(s, &cmd); 395 - if (ret) 396 - goto err; 397 - 398 384 chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 | 399 385 cmd.args[4] << 0; 400 386