From 7c6fc013472e173aa334bc98303cdacbb43bfc60 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 24 Nov 2011 15:04:18 -0200
Subject: [PATCH] --- yaml --- r: 285231 b: refs/heads/master c:
 4a5006f68d6b336564eb1e4cbb1f66d234958889 h: refs/heads/master i:   285229:
 4d3b98de7c5f89c7aea0c6bcc0b4c5d43e4a601b   285227:
 231294bd8b08d85b06eae946b4bc565b903b7c14   285223:
 a6957ec17eefba1977ef889daa14f439981d5afb   285215:
 72a9a44a5135aa5a1e0648fedefe33a56d7c0861 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/dvb/firewire/firedtv-avc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 13f1b5c6e24d..475462c09bd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8503232f2e9604d844d8f52ddea2e55ccc6c38f6
+refs/heads/master: 4a5006f68d6b336564eb1e4cbb1f66d234958889
diff --git a/trunk/drivers/media/dvb/firewire/firedtv-avc.c b/trunk/drivers/media/dvb/firewire/firedtv-avc.c
index 489ae8245867..9debf0f9a137 100644
--- a/trunk/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/trunk/drivers/media/dvb/firewire/firedtv-avc.c
@@ -392,10 +392,11 @@ static int avc_tuner_tuneqpsk(struct firedtv *fdtv,
 			default:		c->operand[13] = 0x2; break;
 			}
 			switch (fdtv->fe.dtv_property_cache.rolloff) {
-			case ROLLOFF_AUTO:	c->operand[14] = 0x2; break;
 			case ROLLOFF_35:	c->operand[14] = 0x2; break;
 			case ROLLOFF_20:	c->operand[14] = 0x0; break;
 			case ROLLOFF_25:	c->operand[14] = 0x1; break;
+			case ROLLOFF_AUTO:
+			default:		c->operand[14] = 0x2; break;
 			/* case ROLLOFF_NONE:	c->operand[14] = 0xff; break; */
 			}
 			switch (fdtv->fe.dtv_property_cache.pilot) {