diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-22 23:25:33 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-23 03:38:13 +0400 |
| commit | fcb388ce6c293b36a71a24c0bfe526c13774302a (patch) | |
| tree | f164b9eed1217d16a1b94d3dea5c20721b2a733f /drivers/media/dvb-frontends/si2168.c | |
| parent | e23cf7f358554139a7c9f0d2739eec187599c670 (diff) | |
| download | linux-fcb388ce6c293b36a71a24c0bfe526c13774302a.tar.xz | |
[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>
Diffstat (limited to 'drivers/media/dvb-frontends/si2168.c')
| -rw-r--r-- | drivers/media/dvb-frontends/si2168.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c index 41bdbc4d9f6c..8f81d979de30 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -381,20 +381,6 @@ static int si2168_init(struct dvb_frontend *fe) if (ret) goto err; - cmd.args[0] = 0x05; - cmd.args[1] = 0x00; - cmd.args[2] = 0xaa; - cmd.args[3] = 0x4d; - cmd.args[4] = 0x56; - cmd.args[5] = 0x40; - cmd.args[6] = 0x00; - cmd.args[7] = 0x00; - cmd.wlen = 8; - cmd.rlen = 1; - ret = si2168_cmd_execute(s, &cmd); - if (ret) - goto err; - chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 | cmd.args[4] << 0; |