From c5624d94cdbce1538d2a94132ca155ed449a6d0c Mon Sep 17 00:00:00 2001
From: Manu Abraham <abraham.manu@gmail.com>
Date: Thu, 18 Jun 2009 04:50:53 -0300
Subject: [PATCH] --- yaml --- r: 153962 b: refs/heads/master c:
 eebf8d86acf0db974dfaad8e8285f4e12ca488e2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 98a3690e91ae..8dd43142cb13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a5ded56fd3f4096681f8e6a249fb058485f4e46
+refs/heads/master: eebf8d86acf0db974dfaad8e8285f4e12ca488e2
diff --git a/trunk/drivers/media/dvb/frontends/stv090x.c b/trunk/drivers/media/dvb/frontends/stv090x.c
index 4e89bb02bff3..488bdfb34fb3 100644
--- a/trunk/drivers/media/dvb/frontends/stv090x.c
+++ b/trunk/drivers/media/dvb/frontends/stv090x.c
@@ -2694,10 +2694,13 @@ static u8 stv090x_optimize_carloop_short(struct stv090x_state *state)
 		break;
 	}
 
-	if (state->dev_ver >= 0x30)
-		short_crl = stv090x_s2_short_crl_cut20;
-	else if (state->dev_ver >= 0x20)
+	if (state->dev_ver >= 0x30) {
+		/* Cut 3.0 and up */
 		short_crl = stv090x_s2_short_crl_cut30;
+	} else {
+		/* Cut 2.0 and up: we don't support cuts older than 2.0 */
+		short_crl = stv090x_s2_short_crl_cut20;
+	}
 
 	if (state->srate <= 3000000)
 		aclc = short_crl[index].crl_2;