]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
[media] cx24120: Fix disecq_send_burst command
authorJemma Denson <jdenson@gmail.com>
Tue, 5 May 2015 21:33:27 +0000 (18:33 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 18 May 2015 20:44:13 +0000 (17:44 -0300)
Previous version of this driver had a memset before every call
to cmd. This meant the default value of cmd.arg[1] was zero unless
burst is set. Make sure it remains zero.
Also fe_sec_mini_cmd_t is an enum, so test against it.

Signed-off-by: Jemma Denson <jdenson@gmail.com>
Signed-off-by: Patrick Boettcher <patrick.boettcher@posteo.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/dvb-frontends/cx24120.c

index 2876b8aae90a5585e05b593654a164d090933106..2fa196a889d7bc70161d80eb03e9e5edd943bd22 100644 (file)
@@ -499,8 +499,7 @@ static int cx24120_diseqc_send_burst(struct dvb_frontend *fe,
        cmd.id = CMD_DISEQC_BURST;
        cmd.len = 0;
        cmd.arg[0] = 0x00;
-       if (burst)
-               cmd.arg[1] = 0x01;
+       cmd.arg[1] = (burst == SEC_MINI_B) ? 0x01 : 0x00;
 
        dev_dbg(&state->i2c->dev, "%s: burst sent.\n", __func__);