diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-23 03:27:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-23 03:27:42 -0300 |
| commit | 041056aacdd5135d44b3d3cb7335c7e30f1430eb (patch) | |
| tree | 958ad1154d926a2697cea38cc605eed8f685e7c3 /linux/drivers | |
| parent | 8b3ed0d52132397a5de88531f5287b5e7864b76e (diff) | |
| parent | e7002b4ad7d625111ed8894228d81b0032a9ca01 (diff) | |
| download | mediapointer-dvb-s2-041056aacdd5135d44b3d3cb7335c7e30f1430eb.tar.gz mediapointer-dvb-s2-041056aacdd5135d44b3d3cb7335c7e30f1430eb.tar.bz2 | |
merge: http://jusst.de/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv090x.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv090x.c b/linux/drivers/media/dvb/frontends/stv090x.c index 62078400f..8b152bea3 100644 --- a/linux/drivers/media/dvb/frontends/stv090x.c +++ b/linux/drivers/media/dvb/frontends/stv090x.c @@ -3405,7 +3405,7 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod static u8 stv090x_optimize_carloop_short(struct stv090x_state *state) { - struct stv090x_short_frame_crloop *short_crl; + struct stv090x_short_frame_crloop *short_crl = NULL; s32 index = 0; u8 aclc = 0x0b; @@ -3425,10 +3425,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; |