7 files changed, 40 insertions, 42 deletions

diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 9bd12832e3d9..07a0b0a968a6 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -928,7 +928,7 @@ static int dst_get_signal(struct dst_state* state)
 {
         int retval;
         u8 get_signal[] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb };
-        printk("%s: Getting Signal strength and other parameters !!!!!!!!\n", __FUNCTION__);
+        dprintk("%s: Getting Signal strength and other parameters\n", __FUNCTION__);
         if ((state->diseq_flags & ATTEMPT_TUNE) == 0) {
                 state->decode_lock = state->decode_strength = state->decode_snr = 0;
                 return 0;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index bdd72f779707..3491ff40885c 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -175,7 +175,7 @@ static int dvb_usb_fe_sleep(struct dvb_frontend *fe)
 int dvb_usb_fe_init(struct dvb_usb_device* d)
 {
         if (d->props.frontend_attach == NULL) {
-                err("strange '%s' don't want to attach a frontend.",d->desc->name);
+                err("strange '%s' doesn't want to attach a frontend.",d->desc->name);
                 return 0;
         }
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
index c3b3ae4f3ec7..65f0c095abc9 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -51,17 +51,17 @@ static int dvb_usb_init(struct dvb_usb_device *d)
 
 /* speed - when running at FULL speed we need a HW PID filter */
         if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) {
-                err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a HW PID filter)");
+                err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
                 return -ENODEV;
         }
 
         if ((d->udev->speed == USB_SPEED_FULL && d->props.caps & DVB_USB_HAS_PID_FILTER) ||
                 (d->props.caps & DVB_USB_NEED_PID_FILTERING)) {
-                info("will use the device's hw PID filter.");
+                info("will use the device's hardware PID filter (table count: %d).",d->props.pid_filter_count);
                 d->pid_filtering = 1;
                 d->max_feed_count = d->props.pid_filter_count;
         } else {
-                info("will pass the complete MPEG2 transport stream to the demuxer.");
+                info("will pass the complete MPEG2 transport stream to the software demuxer.");
                 d->pid_filtering = 0;
                 d->max_feed_count = 255;
         }
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
index 5adc5d69ec84..9ac95f54f9fc 100644
--- a/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -128,7 +128,7 @@ static struct dvb_usb_rc_key vp7045_rc_keys[] = {
         { 0x00, 0x0f, KEY_TEXT } /* Teletext */
 };
 
-static int vp7045_rc_query(struct dvb_usb_device *d, u32 *key_buf, int *state)
+static int vp7045_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
         u8 key;
         int i;
@@ -144,7 +144,7 @@ static int vp7045_rc_query(struct dvb_usb_device *d, u32 *key_buf, int *state)
         for (i = 0; i < sizeof(vp7045_rc_keys)/sizeof(struct dvb_usb_rc_key); i++)
                 if (vp7045_rc_keys[i].data == key) {
                         *state = REMOTE_KEY_PRESSED;
-                        *key_buf = vp7045_rc_keys[i].event;
+                        *event = vp7045_rc_keys[i].event;
                         break;
                 }
         return 0;
diff --git a/drivers/media/dvb/frontends/lgdt3302.c b/drivers/media/dvb/frontends/lgdt3302.c
index 09c914256e49..2eea03d218cd 100644
--- a/drivers/media/dvb/frontends/lgdt3302.c
+++ b/drivers/media/dvb/frontends/lgdt3302.c
@@ -1,6 +1,4 @@
 /*
- * $Id: lgdt3302.c,v 1.5 2005/07/07 03:47:15 mkrufky Exp $
- *
  *    Support for LGDT3302 (DViCO FustionHDTV 3 Gold) - VSB/QAM
  *
  *    Copyright (C) 2005 Wilson Michaels <wilsonmichaels@earthlink.net>
@@ -83,7 +81,10 @@ static int i2c_writebytes (struct lgdt3302_state* state,
 
                 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
                         printk(KERN_WARNING "lgdt3302: %s error (addr %02x <- %02x, err == %i)\n", __FUNCTION__, addr, buf[0], err);
-                        return -EREMOTEIO;
+                        if (err < 0)
+                                return err;
+                        else
+                                return -EREMOTEIO;
                 }
         } else {
                 u8 tmp[] = { buf[0], buf[1] };
@@ -96,7 +97,10 @@ static int i2c_writebytes (struct lgdt3302_state* state,
                         tmp[1] = buf[i];
                         if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
                                 printk(KERN_WARNING "lgdt3302: %s error (addr %02x <- %02x, err == %i)\n", __FUNCTION__, addr, buf[0], err);
-                                return -EREMOTEIO;
+                                if (err < 0)
+                                        return err;
+                                else
+                                        return -EREMOTEIO;
                         }
                         tmp[0]++;
                 }
@@ -218,6 +222,8 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
 
         /* Change only if we are actually changing the modulation */
         if (state->current_modulation != param->u.vsb.modulation) {
+                int value;
+
                 switch(param->u.vsb.modulation) {
                 case VSB_8:
                         dprintk("%s: VSB_8 MODE\n", __FUNCTION__);
@@ -266,36 +272,29 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
                 i2c_writebytes(state, state->config->demod_address,
                                demux_ctrl_cfg, sizeof(demux_ctrl_cfg));
 
-                if (param->u.vsb.modulation == VSB_8) {
-                        /* Initialization for VSB modes only */
-                        /* Change the value of NCOCTFV[25:0]of carrier
-                           recovery center frequency register for VSB */
-                        i2c_writebytes(state, state->config->demod_address,
+                /* Change the value of NCOCTFV[25:0] of carrier
+                   recovery center frequency register */
+                i2c_writebytes(state, state->config->demod_address,
                                        vsb_freq_cfg, sizeof(vsb_freq_cfg));
-                } else {
-                        /* Initialization for QAM modes only */
-                        /* Set the value of 'INLVTHD' register 0x2a/0x2c
-                           to value from 'IFACC' register 0x39/0x3b -1 */
-                        int value;
-                        i2c_selectreadbytes(state, AGC_RFIF_ACC0,
-                                            &agc_delay_cfg[1], 3);
-                        value = ((agc_delay_cfg[1] & 0x0f) << 8) | agc_delay_cfg[3];
-                        value = value -1;
-                        dprintk("%s IFACC -1 = 0x%03x\n", __FUNCTION__, value);
-                        agc_delay_cfg[1] = (value >> 8) & 0x0f;
-                        agc_delay_cfg[2] = 0x00;
-                        agc_delay_cfg[3] = value & 0xff;
-                        i2c_writebytes(state, state->config->demod_address,
-                                       agc_delay_cfg, sizeof(agc_delay_cfg));
-
-                        /* Change the value of IAGCBW[15:8]
-                           of inner AGC loop filter bandwith */
-                        i2c_writebytes(state, state->config->demod_address,
-                                       agc_loop_cfg, sizeof(agc_loop_cfg));
-                }
+                /* Set the value of 'INLVTHD' register 0x2a/0x2c
+                   to value from 'IFACC' register 0x39/0x3b -1 */
+                i2c_selectreadbytes(state, AGC_RFIF_ACC0,
+                                    &agc_delay_cfg[1], 3);
+                value = ((agc_delay_cfg[1] & 0x0f) << 8) | agc_delay_cfg[3];
+                value = value -1;
+                dprintk("%s IFACC -1 = 0x%03x\n", __FUNCTION__, value);
+                agc_delay_cfg[1] = (value >> 8) & 0x0f;
+                agc_delay_cfg[2] = 0x00;
+                agc_delay_cfg[3] = value & 0xff;
+                i2c_writebytes(state, state->config->demod_address,
+                               agc_delay_cfg, sizeof(agc_delay_cfg));
+
+                /* Change the value of IAGCBW[15:8]
+                   of inner AGC loop filter bandwith */
+                i2c_writebytes(state, state->config->demod_address,
+                               agc_loop_cfg, sizeof(agc_loop_cfg));
 
                 state->config->set_ts_params(fe, 0);
-                lgdt3302_SwReset(state);
                 state->current_modulation = param->u.vsb.modulation;
         }
 
@@ -311,11 +310,10 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
                 i2c_readbytes(state, state->config->pll_address, buf, 1);
                 dprintk("%s: tuner status byte = 0x%02x\n", __FUNCTION__, buf[0]);
 
-                lgdt3302_SwReset(state);
-
                 /* Update current frequency */
                 state->current_frequency = param->frequency;
         }
+        lgdt3302_SwReset(state);
         return 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index b65f4b0a481f..9746d2bb916f 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1022,7 +1022,7 @@ static struct pci_device_id pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 static struct saa7146_extension budget_extension = {
-        .name = "budget dvb /w video in\0",
+        .name = "budget_av",
         .pci_tbl = pci_tbl,
 
         .module = THIS_MODULE,
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 2c17a5f58340..aa43b5fcb8e7 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1626,7 +1626,7 @@ static struct usb_device_id ttusb_table[] = {
 MODULE_DEVICE_TABLE(usb, ttusb_table);
 
 static struct usb_driver ttusb_driver = {
-      .name             = "Technotrend/Hauppauge USB-Nova",
+      .name             = "ttusb",
       .probe            = ttusb_probe,
       .disconnect       = ttusb_disconnect,
       .id_table         = ttusb_table,