From b6f84bae6d6bcc80cd9f72230d833920975d532a Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Tue, 10 Jan 2012 20:46:26 -0300
Subject: [PATCH] --- yaml --- r: 285787 b: refs/heads/master c:
 dab734ec95168488c4b32632e968ce885a083078 h: refs/heads/master i:   285785:
 23ba2fd23823afe1e81414c1126ab34007eb824e   285783:
 81c38efebedaf01329692cd1464935cda4124d48 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/dvb/frontends/hd29l2.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b992f1aa72d8..a9a660cbf45c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b748e6a91e136a582943a496eac40071a23beff3
+refs/heads/master: dab734ec95168488c4b32632e968ce885a083078
diff --git a/trunk/drivers/media/dvb/frontends/hd29l2.c b/trunk/drivers/media/dvb/frontends/hd29l2.c
index 9959a5abb532..a00318190837 100644
--- a/trunk/drivers/media/dvb/frontends/hd29l2.c
+++ b/trunk/drivers/media/dvb/frontends/hd29l2.c
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 static int hd29l2_wr_regs(struct hd29l2_priv *priv, u8 reg, u8 *val, int len)
 {
 	int ret;
-	u8 buf[2+len];
+	u8 buf[2 + len];
 	struct i2c_msg msg[1] = {
 		{
 			.addr = priv->cfg.i2c_addr,
@@ -476,7 +476,7 @@ static enum dvbfe_search hd29l2_search(struct dvb_frontend *fe)
 
 	/* ensure modulation validy */
 	/* 0=QAM4_NR, 1=QAM4, 2=QAM16, 3=QAM32, 4=QAM64 */
-	if (modulation > 4) {
+	if (modulation > (ARRAY_SIZE(reg_mod_vals_tab[0].val) - 1)) {
 		dbg("%s: modulation=%d not valid", __func__, modulation);
 		goto err;
 	}
@@ -735,7 +735,7 @@ static int hd29l2_init(struct dvb_frontend *fe)
 	/* reset demod */
 	/* it is recommended to HW reset chip using RST_N pin */
 	if (fe->callback) {
-		ret = fe->callback(fe, 0, 0, 0);
+		ret = fe->callback(fe, DVB_FRONTEND_COMPONENT_DEMOD, 0, 0);
 		if (ret)
 			goto err;