From: Jemma Denson <jdenson@gmail.com>
Date: Tue, 5 May 2015 21:33:27 +0000 (-0300)
Subject: [media] cx24120: Fix disecq_send_burst command
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7c95e25e38c03a64659343ddbb64fdbb5ff2e25a;p=deliverable%2Flinux.git

[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 <jdenson@gmail.com>
Signed-off-by: Patrick Boettcher <patrick.boettcher@posteo.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

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__);