summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/cx88-dvb.c6
-rw-r--r--v4l/ChangeLog7
2 files changed, 9 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index a24007027..d179f2d66 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-dvb.c,v 1.65 2005/09/07 01:03:03 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.66 2005/09/07 05:32:20 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* MPEG Transport Stream (DVB) routines
@@ -230,9 +230,7 @@ static int lgdt330x_pll_set(struct dvb_frontend* fe,
int err;
/* Put the analog decoder in standby to keep it quiet */
- if (core->tda9887_conf) {
- cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
- }
+ cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
dvb_pll_configure(core->pll_desc, buf, params->frequency, 0);
dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index b75fb985c..1c9fe00fe 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-07 05:29 mkrufky
+
+ * cx88-dvb.c: (lgdt330x_pll_set):
+ - Removed unnecessary check for tda9887.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-09-07 04:59 mkrufky
* bttv-cards.c: (bttv_init_card1), (bttv_init_card2):