10 files changed, 29 insertions, 43 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index be4266d4ae91..56495cb6cd02 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -172,8 +172,6 @@ static u32 flexcop_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm flexcop_algo = {
-        .name                   = "FlexCop I2C algorithm",
-        .id                             = I2C_ALGO_BIT,
         .master_xfer    = flexcop_master_xfer,
         .functionality  = flexcop_i2c_func,
 };
@@ -192,7 +190,6 @@ int flexcop_i2c_init(struct flexcop_device *fc)
         fc->i2c_adap.class          = I2C_CLASS_TV_DIGITAL;
         fc->i2c_adap.algo       = &flexcop_algo;
         fc->i2c_adap.algo_data  = NULL;
-        fc->i2c_adap.id         = I2C_ALGO_BIT;
 
         if ((ret = i2c_add_adapter(&fc->i2c_adap)) < 0)
                 return ret;
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index b12545f093f8..1e85d16491b0 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -1,5 +1,5 @@
 config DVB_BT8XX
-        tristate "Nebula/Pinnacle PCTV/Twinhan PCI cards"
+        tristate "BT8xx based PCI cards"
         depends on DVB_CORE && PCI && VIDEO_BT848
         select DVB_MT352
         select DVB_SP887X
@@ -8,8 +8,8 @@ config DVB_BT8XX
         select DVB_OR51211
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
-          the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards and
-          pcHDTV HD2000 cards.
+          the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,
+          the pcHDTV HD2000 cards, and certain AVerMedia cards.
 
           Since these cards have no MPEG decoder onboard, they transmit
           only compressed MPEG data over the PCI bus, so you need
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 7d8b3cad350b..9ea5747b1211 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -888,7 +888,7 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
         if (down_interruptible(&cinergyt2->sem))
                 return -ERESTARTSYS;
 
-        if (state > 0) {        /* state 0 seems to mean DEVICE_PM_ON */
+        if (state.event > PM_EVENT_ON) {
                 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
 #ifdef ENABLE_RC
                 cancel_delayed_work(&cinergyt2->rc_query_work);
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index c3e1b661aae6..9e96a188f1e9 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -141,8 +141,6 @@ static u32 cxusb_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm cxusb_i2c_algo = {
-        .name          = "Conexant USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = cxusb_i2c_xfer,
         .functionality = cxusb_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 9b9d6f8ee74e..00b946419b40 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -156,8 +156,6 @@ static u32 dibusb_i2c_func(struct i2c_adapter *adapter)
 }
 
 struct i2c_algorithm dibusb_i2c_algo = {
-        .name          = "DiBcom USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = dibusb_i2c_xfer,
         .functionality = dibusb_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 9a676afc1d6e..f70e0be0920a 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -77,8 +77,6 @@ static u32 digitv_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm digitv_i2c_algo = {
-        .name          = "Nebula DigiTV USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = digitv_i2c_xfer,
         .functionality = digitv_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 9f0a8d90d146..da970947dfc7 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -27,7 +27,6 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
 #endif
         d->i2c_adap.algo      = d->props.i2c_algo;
         d->i2c_adap.algo_data = NULL;
-        d->i2c_adap.id        = I2C_ALGO_BIT;
 
         i2c_set_adapdata(&d->i2c_adap, d);
 
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 1f1cd7a8d500..7142b9c51dd2 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -69,8 +69,8 @@ struct lgdt330x_state
 };
 
 static int i2c_write_demod_bytes (struct lgdt330x_state* state,
-                           u8 *buf, /* data bytes to send */
-                           int len  /* number of bytes to send */ )
+                                  u8 *buf, /* data bytes to send */
+                                  int len  /* number of bytes to send */ )
 {
         struct i2c_msg msg =
                 { .addr = state->config->demod_address,
@@ -129,13 +129,13 @@ static int lgdt3302_SwReset(struct lgdt330x_state* state)
         };
 
         ret = i2c_write_demod_bytes(state,
-                             reset, sizeof(reset));
+                                    reset, sizeof(reset));
         if (ret == 0) {
 
                 /* force reset high (inactive) and unmask interrupts */
                 reset[1] = 0x7f;
                 ret = i2c_write_demod_bytes(state,
-                                     reset, sizeof(reset));
+                                            reset, sizeof(reset));
         }
         return ret;
 }
@@ -149,13 +149,13 @@ static int lgdt3303_SwReset(struct lgdt330x_state* state)
         };
 
         ret = i2c_write_demod_bytes(state,
-                             reset, sizeof(reset));
+                                    reset, sizeof(reset));
         if (ret == 0) {
 
                 /* force reset high (inactive) */
                 reset[1] = 0x01;
                 ret = i2c_write_demod_bytes(state,
-                                     reset, sizeof(reset));
+                                            reset, sizeof(reset));
         }
         return ret;
 }
@@ -172,7 +172,6 @@ static int lgdt330x_SwReset(struct lgdt330x_state* state)
         }
 }
 
-
 static int lgdt330x_init(struct dvb_frontend* fe)
 {
         /* Hardware reset is done using gpio[0] of cx23880x chip.
@@ -229,13 +228,13 @@ static int lgdt330x_init(struct dvb_frontend* fe)
         case LGDT3302:
                 chip_name = "LGDT3302";
                 err = i2c_write_demod_bytes(state, lgdt3302_init_data,
-                                                                        sizeof(lgdt3302_init_data));
-                break;
+                                            sizeof(lgdt3302_init_data));
+                break;
         case LGDT3303:
                 chip_name = "LGDT3303";
                 err = i2c_write_demod_bytes(state, lgdt3303_init_data,
-                                                                        sizeof(lgdt3303_init_data));
-                break;
+                                            sizeof(lgdt3303_init_data));
+                break;
         default:
                 chip_name = "undefined";
                 printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n");
@@ -262,15 +261,15 @@ static int lgdt330x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         switch (state->config->demod_chip) {
         case LGDT3302:
                 err = i2c_read_demod_bytes(state, LGDT3302_PACKET_ERR_COUNTER1,
-                                                                  buf, sizeof(buf));
-                break;
+                                           buf, sizeof(buf));
+                break;
         case LGDT3303:
                 err = i2c_read_demod_bytes(state, LGDT3303_PACKET_ERR_COUNTER1,
-                                                                  buf, sizeof(buf));
-                break;
+                                           buf, sizeof(buf));
+                break;
         default:
                 printk(KERN_WARNING
-                           "Only LGDT3302 and LGDT3303 are supported chips.\n");
+                       "Only LGDT3302 and LGDT3303 are supported chips.\n");
                 err = -ENODEV;
         }
 
@@ -330,7 +329,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
 
                         if (state->config->demod_chip == LGDT3303) {
                                 err = i2c_write_demod_bytes(state, lgdt3303_8vsb_44_data,
-                                                                                        sizeof(lgdt3303_8vsb_44_data));
+                                                            sizeof(lgdt3303_8vsb_44_data));
                         }
                         break;
 
@@ -378,18 +377,19 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
 
                 /* Select the requested mode */
                 i2c_write_demod_bytes(state, top_ctrl_cfg,
-                                                          sizeof(top_ctrl_cfg));
-                state->config->set_ts_params(fe, 0);
+                                      sizeof(top_ctrl_cfg));
+                if (state->config->set_ts_params)
+                        state->config->set_ts_params(fe, 0);
                 state->current_modulation = param->u.vsb.modulation;
         }
 
-        /* Change only if we are actually changing the channel */
-        if (state->current_frequency != param->frequency) {
-                /* Tune to the new frequency */
+        /* Tune to the specified frequency */
+        if (state->config->pll_set)
                 state->config->pll_set(fe, param);
-                /* Keep track of the new frequency */
-                state->current_frequency = param->frequency;
-        }
+
+        /* Keep track of the new frequency */
+        state->current_frequency = param->frequency;
+
         lgdt330x_SwReset(state);
         return 0;
 }
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 706e0bcb5ede..85b437bbddcd 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -633,7 +633,6 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
         i2c_set_adapdata(&pluto->i2c_adap, pluto);
         strcpy(pluto->i2c_adap.name, DRIVER_NAME);
         pluto->i2c_adap.owner = THIS_MODULE;
-        pluto->i2c_adap.id = I2C_ALGO_BIT;
         pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
         pluto->i2c_adap.dev.parent = &pdev->dev;
         pluto->i2c_adap.algo_data = &pluto->i2c_bit;
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index aa43b5fcb8e7..7daf7b1598a0 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1472,8 +1472,6 @@ static void frontend_init(struct ttusb* ttusb)
 
 
 static struct i2c_algorithm ttusb_dec_algo = {
-        .name           = "ttusb dec i2c algorithm",
-        .id             = I2C_ALGO_BIT,
         .master_xfer    = master_xfer,
         .functionality  = functionality,
 };
@@ -1525,7 +1523,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 #endif
         ttusb->i2c_adap.algo              = &ttusb_dec_algo;
         ttusb->i2c_adap.algo_data         = NULL;
-        ttusb->i2c_adap.id                = I2C_ALGO_BIT;
 
         result = i2c_add_adapter(&ttusb->i2c_adap);
         if (result) {