From 8e2cb4ef17a108ffd0d75ee4e6b2a3a60e4be411 Mon Sep 17 00:00:00 2001
From: Christophe Thommeret <hftom@free.fr>
Date: Wed, 15 Oct 2008 20:01:32 -0300
Subject: [PATCH] --- yaml --- r: 115664 b: refs/heads/master c:
 745632147d54cd4db6812045351510ebd3981a24 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7435abf6ba20..fd0270814489 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 430189da042f8cc3305b8fbbce18ea103501fb90
+refs/heads/master: 745632147d54cd4db6812045351510ebd3981a24
diff --git a/trunk/drivers/media/dvb/frontends/cx24116.c b/trunk/drivers/media/dvb/frontends/cx24116.c
index 8afdfbec551b..fe62f92f6601 100644
--- a/trunk/drivers/media/dvb/frontends/cx24116.c
+++ b/trunk/drivers/media/dvb/frontends/cx24116.c
@@ -1248,7 +1248,10 @@ static int cx24116_set_frontend(struct dvb_frontend *fe,
 
 		switch (c->pilot) {
 		case PILOT_AUTO:	/* Not supported but emulated */
-			retune = 2;	/* Fall-through */
+			state->dnxt.pilot_val = (c->modulation == QPSK)
+				? CX24116_PILOT_OFF : CX24116_PILOT_ON;
+			retune = 2;
+			break;
 		case PILOT_OFF:
 			state->dnxt.pilot_val = CX24116_PILOT_OFF;
 			break;