From 7c95e25e38c03a64659343ddbb64fdbb5ff2e25a Mon Sep 17 00:00:00 2001 From: Jemma Denson Date: Tue, 5 May 2015 18:33:27 -0300 Subject: [PATCH] [media] cx24120: Fix disecq_send_burst command 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 Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb-frontends/cx24120.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c index 2876b8aae90a..2fa196a889d7 100644 --- a/drivers/media/dvb-frontends/cx24120.c +++ b/drivers/media/dvb-frontends/cx24120.c @@ -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__); -- 2.20.1