From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 6 Apr 2008 02:08:08 +0000 (-0300)
Subject: V4L/DVB (7630): au8522: fix au8522_read_ucblocks for qam
X-Git-Tag: v2.6.26-rc1~1084^2~93
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8973dc4b70c5506596207da3fddab03002357178;p=linux-2.6-omap-h63xx.git

V4L/DVB (7630): au8522: fix au8522_read_ucblocks for qam

ucblocks are reported in separate registers for vsb & qam

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/dvb/frontends/au8522.c b/drivers/media/dvb/frontends/au8522.c
index dc01e75cdc6..9fb61e6ed67 100644
--- a/drivers/media/dvb/frontends/au8522.c
+++ b/drivers/media/dvb/frontends/au8522.c
@@ -340,7 +340,10 @@ static int au8522_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 {
 	struct au8522_state *state = fe->demodulator_priv;
 
-	*ucblocks = au8522_readreg(state, 0x4087);
+	if (state->current_modulation == VSB_8)
+		*ucblocks = au8522_readreg(state, 0x4087);
+	else
+		*ucblocks = au8522_readreg(state, 0x4543);
 
 	return 0;
 }