aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Toth <stoth@linuxtv.org>2008-10-16 22:16:50 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 12:30:43 -0400
commitc96de5197d038cd1c5538085109c7329434ee94b (patch)
tree0f9f6242a926c3743333a362b67592d365615b14
parentf4ef033ee03b36ba1b1d39007d740f2786a93f2b (diff)
V4L/DVB (9309): s5h1411: I/F related bugfix for 3.25 and remove spurious define
This should improve performance. Signed-off-by: Steven Toth <stoth@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/frontends/s5h1411.c2
-rw-r--r--drivers/media/dvb/frontends/s5h1411.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c
index a642cae63606..25a3fb31e023 100644
--- a/drivers/media/dvb/frontends/s5h1411.c
+++ b/drivers/media/dvb/frontends/s5h1411.c
@@ -392,7 +392,7 @@ static int s5h1411_set_if_freq(struct dvb_frontend *fe, int KHz)
392 392
393 switch (KHz) { 393 switch (KHz) {
394 case 3250: 394 case 3250:
395 s5h1411_writereg(state, S5H1411_I2C_TOP_ADDR, 0x38, 0x10d9); 395 s5h1411_writereg(state, S5H1411_I2C_TOP_ADDR, 0x38, 0x10d5);
396 s5h1411_writereg(state, S5H1411_I2C_TOP_ADDR, 0x39, 0x5342); 396 s5h1411_writereg(state, S5H1411_I2C_TOP_ADDR, 0x39, 0x5342);
397 s5h1411_writereg(state, S5H1411_I2C_QAM_ADDR, 0x2c, 0x10d9); 397 s5h1411_writereg(state, S5H1411_I2C_QAM_ADDR, 0x2c, 0x10d9);
398 break; 398 break;
diff --git a/drivers/media/dvb/frontends/s5h1411.h b/drivers/media/dvb/frontends/s5h1411.h
index 7d542bc00c48..2370a06debdb 100644
--- a/drivers/media/dvb/frontends/s5h1411.h
+++ b/drivers/media/dvb/frontends/s5h1411.h
@@ -47,7 +47,6 @@ struct s5h1411_config {
47 u16 mpeg_timing; 47 u16 mpeg_timing;
48 48
49 /* IF Freq for QAM and VSB in KHz */ 49 /* IF Freq for QAM and VSB in KHz */
50#define S5H1411_IF_2500 2500
51#define S5H1411_IF_3500 3500 50#define S5H1411_IF_3500 3500
52#define S5H1411_IF_4000 4000 51#define S5H1411_IF_4000 4000
53#define S5H1411_IF_5380 5380 52#define S5H1411_IF_5380 5380