Merge commit 'v2.6.35-rc3' into for-linus

17 files changed, 194 insertions, 82 deletions

diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index b762e561a6d5..bca07c0bcd01 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -594,7 +594,7 @@ static irqreturn_t dm1105_irq(int irq, void *dev_id)
 int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)
 {
         struct input_dev *input_dev;
-        char *ir_codes = NULL;
+        char *ir_codes = RC_MAP_DM1105_NEC;
         int err = -ENOMEM;
 
         input_dev = input_allocate_device();
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index f6dac2bb0ac6..6c3a8a06ccab 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -351,6 +351,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
         const u8 *ts, *ts_end, *from_where = NULL;
         u8 ts_remain = 0, how_much = 0, new_ts = 1;
         struct ethhdr *ethh = NULL;
+        bool error = false;
 
 #ifdef ULE_DEBUG
         /* The code inside ULE_DEBUG keeps a history of the last 100 TS cells processed. */
@@ -460,10 +461,16 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
 
                                                 /* Drop partly decoded SNDU, reset state, resync on PUSI. */
                                                 if (priv->ule_skb) {
-                                                        dev_kfree_skb( priv->ule_skb );
+                                                        error = true;
+                                                        dev_kfree_skb(priv->ule_skb);
+                                                }
+
+                                                if (error || priv->ule_sndu_remain) {
                                                         dev->stats.rx_errors++;
                                                         dev->stats.rx_frame_errors++;
+                                                        error = false;
                                                 }
+
                                                 reset_ule(priv);
                                                 priv->need_pusi = 1;
                                                 continue;
@@ -535,6 +542,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
                                 from_where += 2;
                         }
 
+                        priv->ule_sndu_remain = priv->ule_sndu_len + 2;
                         /*
                          * State of current TS:
                          *   ts_remain (remaining bytes in the current TS cell)
@@ -544,6 +552,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
                          */
                         switch (ts_remain) {
                                 case 1:
+                                        priv->ule_sndu_remain--;
                                         priv->ule_sndu_type = from_where[0] << 8;
                                         priv->ule_sndu_type_1 = 1; /* first byte of ule_type is set. */
                                         ts_remain -= 1; from_where += 1;
@@ -557,6 +566,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
                                 default: /* complete ULE header is present in current TS. */
                                         /* Extract ULE type field. */
                                         if (priv->ule_sndu_type_1) {
+                                                priv->ule_sndu_type_1 = 0;
                                                 priv->ule_sndu_type |= from_where[0];
                                                 from_where += 1; /* points to payload start. */
                                                 ts_remain -= 1;
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index e5f91f16ffa4..553b48ac1919 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -76,6 +76,7 @@ config DVB_USB_DIB0700
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         select DVB_LGDT3305 if !DVB_FE_CUSTOMISE
         select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
+        select DVB_TUNER_DIB0090 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
@@ -134,6 +135,7 @@ config DVB_USB_M920X
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.
           Currently, only devices with a product id of
@@ -264,7 +266,7 @@ config DVB_USB_DW2102
         select DVB_STB6000 if !DVB_FE_CUSTOMISE
         select DVB_CX24116 if !DVB_FE_CUSTOMISE
         select DVB_SI21XX if !DVB_FE_CUSTOMISE
-        select DVB_TDA10021 if !DVB_FE_CUSTOMISE
+        select DVB_TDA10023 if !DVB_FE_CUSTOMISE
         select DVB_MT312 if !DVB_FE_CUSTOMISE
         select DVB_ZL10039 if !DVB_FE_CUSTOMISE
         select DVB_DS3000 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 0eb490889162..11e9e85dac86 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -1026,8 +1026,10 @@ static int cxusb_dualdig4_rev2_frontend_attach(struct dvb_usb_adapter *adap)
         cxusb_bluebird_gpio_pulse(adap->dev, 0x02, 1);
 
         if (dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,
-                                 &cxusb_dualdig4_rev2_config) < 0)
+                                     &cxusb_dualdig4_rev2_config) < 0) {
+                printk(KERN_WARNING "Unable to enumerate dib7000p\n");
                 return -ENODEV;
+        }
 
         adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80,
                               &cxusb_dualdig4_rev2_config);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 085c4e457e0e..b4afe6f8ed19 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -198,6 +198,7 @@
 #define USB_PID_AVERMEDIA_A850                          0x850a
 #define USB_PID_AVERMEDIA_A805                          0xa805
 #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
+#define USB_PID_TECHNOTREND_CONNECT_CT3650              0x300d
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2      0x0081
 #define USB_PID_TERRATEC_CINERGY_HT_USB_XE              0x0058
diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/dvb/dvb-usb/ttusb2.c
index 20ca9d9ee99b..a6de489a6a39 100644
--- a/drivers/media/dvb/dvb-usb/ttusb2.c
+++ b/drivers/media/dvb/dvb-usb/ttusb2.c
@@ -29,6 +29,8 @@
 
 #include "tda826x.h"
 #include "tda10086.h"
+#include "tda1002x.h"
+#include "tda827x.h"
 #include "lnbp21.h"
 
 /* debug */
@@ -150,7 +152,17 @@ static struct tda10086_config tda10086_config = {
         .xtal_freq = TDA10086_XTAL_16M,
 };
 
-static int ttusb2_frontend_attach(struct dvb_usb_adapter *adap)
+static struct tda10023_config tda10023_config = {
+        .demod_address = 0x0c,
+        .invert = 0,
+        .xtal = 16000000,
+        .pll_m = 11,
+        .pll_p = 3,
+        .pll_n = 1,
+        .deltaf = 0xa511,
+};
+
+static int ttusb2_frontend_tda10086_attach(struct dvb_usb_adapter *adap)
 {
         if (usb_set_interface(adap->dev->udev,0,3) < 0)
                 err("set interface to alts=3 failed");
@@ -163,7 +175,27 @@ static int ttusb2_frontend_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static int ttusb2_tuner_attach(struct dvb_usb_adapter *adap)
+static int ttusb2_frontend_tda10023_attach(struct dvb_usb_adapter *adap)
+{
+        if (usb_set_interface(adap->dev->udev, 0, 3) < 0)
+                err("set interface to alts=3 failed");
+        if ((adap->fe = dvb_attach(tda10023_attach, &tda10023_config, &adap->dev->i2c_adap, 0x48)) == NULL) {
+                deb_info("TDA10023 attach failed\n");
+                return -ENODEV;
+        }
+        return 0;
+}
+
+static int ttusb2_tuner_tda827x_attach(struct dvb_usb_adapter *adap)
+{
+        if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, NULL) == NULL) {
+                printk(KERN_ERR "%s: No tda827x found!\n", __func__);
+                return -ENODEV;
+        }
+        return 0;
+}
+
+static int ttusb2_tuner_tda826x_attach(struct dvb_usb_adapter *adap)
 {
         if (dvb_attach(tda826x_attach, adap->fe, 0x60, &adap->dev->i2c_adap, 0) == NULL) {
                 deb_info("TDA8263 attach failed\n");
@@ -180,6 +212,7 @@ static int ttusb2_tuner_attach(struct dvb_usb_adapter *adap)
 /* DVB USB Driver stuff */
 static struct dvb_usb_device_properties ttusb2_properties;
 static struct dvb_usb_device_properties ttusb2_properties_s2400;
+static struct dvb_usb_device_properties ttusb2_properties_ct3650;
 
 static int ttusb2_probe(struct usb_interface *intf,
                 const struct usb_device_id *id)
@@ -187,6 +220,8 @@ static int ttusb2_probe(struct usb_interface *intf,
         if (0 == dvb_usb_device_init(intf, &ttusb2_properties,
                                      THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &ttusb2_properties_s2400,
+                                     THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf, &ttusb2_properties_ct3650,
                                      THIS_MODULE, NULL, adapter_nr))
                 return 0;
         return -ENODEV;
@@ -197,6 +232,8 @@ static struct usb_device_id ttusb2_table [] = {
         { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_450E) },
         { USB_DEVICE(USB_VID_TECHNOTREND,
                 USB_PID_TECHNOTREND_CONNECT_S2400) },
+        { USB_DEVICE(USB_VID_TECHNOTREND,
+                USB_PID_TECHNOTREND_CONNECT_CT3650) },
         {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, ttusb2_table);
@@ -214,8 +251,8 @@ static struct dvb_usb_device_properties ttusb2_properties = {
                 {
                         .streaming_ctrl   = NULL, // ttusb2_streaming_ctrl,
 
-                        .frontend_attach  = ttusb2_frontend_attach,
-                        .tuner_attach     = ttusb2_tuner_attach,
+                        .frontend_attach  = ttusb2_frontend_tda10086_attach,
+                        .tuner_attach     = ttusb2_tuner_tda826x_attach,
 
                         /* parameter for the MPEG2-data transfer */
                         .stream = {
@@ -266,8 +303,8 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400 = {
                 {
                         .streaming_ctrl   = NULL,
 
-                        .frontend_attach  = ttusb2_frontend_attach,
-                        .tuner_attach     = ttusb2_tuner_attach,
+                        .frontend_attach  = ttusb2_frontend_tda10086_attach,
+                        .tuner_attach     = ttusb2_tuner_tda826x_attach,
 
                         /* parameter for the MPEG2-data transfer */
                         .stream = {
@@ -301,6 +338,52 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400 = {
         }
 };
 
+static struct dvb_usb_device_properties ttusb2_properties_ct3650 = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl = CYPRESS_FX2,
+
+        .size_of_priv = sizeof(struct ttusb2_state),
+
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .streaming_ctrl   = NULL,
+
+                        .frontend_attach  = ttusb2_frontend_tda10023_attach,
+                        .tuner_attach = ttusb2_tuner_tda827x_attach,
+
+                        /* parameter for the MPEG2-data transfer */
+                        .stream = {
+                                .type = USB_ISOC,
+                                .count = 5,
+                                .endpoint = 0x02,
+                                .u = {
+                                        .isoc = {
+                                                .framesperurb = 4,
+                                                .framesize = 940,
+                                                .interval = 1,
+                                        }
+                                }
+                        }
+                },
+        },
+
+        .power_ctrl       = ttusb2_power_ctrl,
+        .identify_state   = ttusb2_identify_state,
+
+        .i2c_algo         = &ttusb2_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "Technotrend TT-connect CT-3650",
+                        .warm_ids = { &ttusb2_table[3], NULL },
+                },
+        }
+};
+
 static struct usb_driver ttusb2_driver = {
         .name           = "dvb_usb_ttusb2",
         .probe          = ttusb2_probe,
diff --git a/drivers/media/dvb/firewire/firedtv-1394.c b/drivers/media/dvb/firewire/firedtv-1394.c
index 26333b4f4d3e..b34ca7afb0e6 100644
--- a/drivers/media/dvb/firewire/firedtv-1394.c
+++ b/drivers/media/dvb/firewire/firedtv-1394.c
@@ -58,7 +58,7 @@ static void rawiso_activity_cb(struct hpsb_iso *iso)
         num = hpsb_iso_n_ready(iso);
 
         if (!fdtv) {
-                dev_err(fdtv->device, "received at unknown iso channel\n");
+                pr_err("received at unknown iso channel\n");
                 goto out;
         }
 
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c
index 68dba3a4b4da..29cdbfe36852 100644
--- a/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/drivers/media/dvb/frontends/au8522_decoder.c
@@ -567,30 +567,6 @@ static int au8522_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 
 /* ----------------------------------------------------------------------- */
 
-static int au8522_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-        switch (fmt->type) {
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
-static int au8522_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-        switch (fmt->type) {
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-                /* Not yet implemented */
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int au8522_g_register(struct v4l2_subdev *sd,
                              struct v4l2_dbg_register *reg)
@@ -772,8 +748,6 @@ static const struct v4l2_subdev_audio_ops au8522_audio_ops = {
 
 static const struct v4l2_subdev_video_ops au8522_video_ops = {
         .s_routing = au8522_s_video_routing,
-        .g_fmt = au8522_g_fmt,
-        .s_fmt = au8522_s_fmt,
         .s_stream = au8522_s_stream,
 };
 
diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
index 78001e8bcdb7..fc61d9230db8 100644
--- a/drivers/media/dvb/frontends/ds3000.c
+++ b/drivers/media/dvb/frontends/ds3000.c
@@ -969,15 +969,12 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config,
         dprintk("%s\n", __func__);
 
         /* allocate memory for the internal state */
-        state = kmalloc(sizeof(struct ds3000_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct ds3000_state), GFP_KERNEL);
         if (state == NULL) {
                 printk(KERN_ERR "Unable to kmalloc\n");
                 goto error2;
         }
 
-        /* setup the state */
-        memset(state, 0, sizeof(struct ds3000_state));
-
         state->config = config;
         state->i2c = i2c;
         state->prevUCBS2 = 0;
diff --git a/drivers/media/dvb/frontends/stv6110x.c b/drivers/media/dvb/frontends/stv6110x.c
index 42591ce1aaad..f36cab12bdc7 100644
--- a/drivers/media/dvb/frontends/stv6110x.c
+++ b/drivers/media/dvb/frontends/stv6110x.c
@@ -303,7 +303,10 @@ static int stv6110x_set_mode(struct dvb_frontend *fe, enum tuner_mode mode)
 
 static int stv6110x_sleep(struct dvb_frontend *fe)
 {
-        return stv6110x_set_mode(fe, TUNER_SLEEP);
+        if (fe->tuner_priv)
+                return stv6110x_set_mode(fe, TUNER_SLEEP);
+
+        return 0;
 }
 
 static int stv6110x_get_status(struct dvb_frontend *fe, u32 *status)
diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
index 692c3e226e83..4692a41ad95b 100644
--- a/drivers/media/dvb/ngene/ngene-cards.c
+++ b/drivers/media/dvb/ngene/ngene-cards.c
@@ -217,6 +217,19 @@ static struct ngene_info ngene_info_cineS2v5 = {
         .fw_version     = 15,
 };
 
+static struct ngene_info ngene_info_duoFlexS2 = {
+        .type           = NGENE_SIDEWINDER,
+        .name           = "Digital Devices DuoFlex S2 miniPCIe",
+        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
+        .demod_attach   = {demod_attach_stv0900, demod_attach_stv0900},
+        .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110},
+        .fe_config      = {&fe_cineS2, &fe_cineS2},
+        .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1},
+        .lnb            = {0x0a, 0x08},
+        .tsf            = {3, 3},
+        .fw_version     = 15,
+};
+
 static struct ngene_info ngene_info_m780 = {
         .type           = NGENE_APP,
         .name           = "Aver M780 ATSC/QAM-B",
@@ -256,6 +269,8 @@ static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
         NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
         NGENE_ID(0x18c3, 0xdb02, ngene_info_satixS2v2),
         NGENE_ID(0x18c3, 0xdd00, ngene_info_cineS2v5),
+        NGENE_ID(0x18c3, 0xdd10, ngene_info_duoFlexS2),
+        NGENE_ID(0x18c3, 0xdd20, ngene_info_duoFlexS2),
         NGENE_ID(0x1461, 0x062e, ngene_info_m780),
         {0}
 };
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index c8b4dfa0ab5f..4caeb163a666 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -53,8 +53,6 @@ MODULE_PARM_DESC(debug, "Print debugging information.");
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-#define COMMAND_TIMEOUT_WORKAROUND
-
 #define dprintk if (debug) printk
 
 #define ngwriteb(dat, adr)         writeb((dat), (char *)(dev->iomem + (adr)))
@@ -147,24 +145,24 @@ static void demux_tasklet(unsigned long data)
                 } else {
                         if (chan->HWState == HWSTATE_RUN) {
                                 u32 Flags = 0;
+                                IBufferExchange *exch1 = chan->pBufferExchange;
+                                IBufferExchange *exch2 = chan->pBufferExchange2;
                                 if (Cur->ngeneBuffer.SR.Flags & 0x01)
                                         Flags |= BEF_EVEN_FIELD;
                                 if (Cur->ngeneBuffer.SR.Flags & 0x20)
                                         Flags |= BEF_OVERFLOW;
-                                if (chan->pBufferExchange)
-                                        chan->pBufferExchange(chan,
-                                                              Cur->Buffer1,
-                                                              chan->
-                                                              Capture1Length,
-                                                              Cur->ngeneBuffer.
-                                                              SR.Clock, Flags);
-                                if (chan->pBufferExchange2)
-                                        chan->pBufferExchange2(chan,
-                                                               Cur->Buffer2,
-                                                               chan->
-                                                               Capture2Length,
-                                                               Cur->ngeneBuffer.
-                                                               SR.Clock, Flags);
+                                spin_unlock_irq(&chan->state_lock);
+                                if (exch1)
+                                        exch1(chan, Cur->Buffer1,
+                                                chan->Capture1Length,
+                                                Cur->ngeneBuffer.SR.Clock,
+                                                Flags);
+                                if (exch2)
+                                        exch2(chan, Cur->Buffer2,
+                                                chan->Capture2Length,
+                                                Cur->ngeneBuffer.SR.Clock,
+                                                Flags);
+                                spin_lock_irq(&chan->state_lock);
                         } else if (chan->HWState != HWSTATE_STOP)
                                 chan->HWState = HWSTATE_RUN;
                 }
@@ -572,11 +570,7 @@ static int ngene_command_stream_control(struct ngene *dev, u8 stream,
         u16 BsSPI = ((stream & 1) ? 0x9800 : 0x9700);
         u16 BsSDO = 0x9B00;
 
-        /* down(&dev->stream_mutex); */
-        while (down_trylock(&dev->stream_mutex)) {
-                printk(KERN_INFO DEVICE_NAME ": SC locked\n");
-                msleep(1);
-        }
+        down(&dev->stream_mutex);
         memset(&com, 0, sizeof(com));
         com.cmd.hdr.Opcode = CMD_CONTROL;
         com.cmd.hdr.Length = sizeof(struct FW_STREAM_CONTROL) - 2;
@@ -1252,14 +1246,17 @@ static int ngene_load_firm(struct ngene *dev)
                 version = 15;
                 size = 23466;
                 fw_name = "ngene_15.fw";
+                dev->cmd_timeout_workaround = true;
                 break;
         case 16:
                 size = 23498;
                 fw_name = "ngene_16.fw";
+                dev->cmd_timeout_workaround = true;
                 break;
         case 17:
                 size = 24446;
                 fw_name = "ngene_17.fw";
+                dev->cmd_timeout_workaround = true;
                 break;
         }
 
@@ -1299,11 +1296,16 @@ static void ngene_stop(struct ngene *dev)
         ngwritel(0, NGENE_EVENT);
         ngwritel(0, NGENE_EVENT_HI);
         free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
+        if (dev->msi_enabled)
+                pci_disable_msi(dev->pci_dev);
+#endif
 }
 
 static int ngene_start(struct ngene *dev)
 {
         int stat;
+        unsigned long flags;
         int i;
 
         pci_set_master(dev->pci_dev);
@@ -1333,6 +1335,28 @@ static int ngene_start(struct ngene *dev)
         if (stat < 0)
                 goto fail;
 
+#ifdef CONFIG_PCI_MSI
+        /* enable MSI if kernel and card support it */
+        if (pci_msi_enabled() && dev->card_info->msi_supported) {
+                ngwritel(0, NGENE_INT_ENABLE);
+                free_irq(dev->pci_dev->irq, dev);
+                stat = pci_enable_msi(dev->pci_dev);
+                if (stat) {
+                        printk(KERN_INFO DEVICE_NAME
+                                ": MSI not available\n");
+                        flags = IRQF_SHARED;
+                } else {
+                        flags = 0;
+                        dev->msi_enabled = true;
+                }
+                stat = request_irq(dev->pci_dev->irq, irq_handler,
+                                        flags, "nGene", dev);
+                if (stat < 0)
+                        goto fail2;
+                ngwritel(1, NGENE_INT_ENABLE);
+        }
+#endif
+
         stat = ngene_i2c_init(dev, 0);
         if (stat < 0)
                 goto fail;
@@ -1358,10 +1382,18 @@ static int ngene_start(struct ngene *dev)
                         bconf = BUFFER_CONFIG_3333;
                 stat = ngene_command_config_buf(dev, bconf);
         }
-        return stat;
+        if (!stat)
+                return stat;
+
+        /* otherwise error: fall through */
 fail:
         ngwritel(0, NGENE_INT_ENABLE);
         free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
+fail2:
+        if (dev->msi_enabled)
+                pci_disable_msi(dev->pci_dev);
+#endif
         return stat;
 }
 
@@ -1379,10 +1411,8 @@ static void release_channel(struct ngene_channel *chan)
         struct ngene_info *ni = dev->card_info;
         int io = ni->io_type[chan->number];
 
-#ifdef COMMAND_TIMEOUT_WORKAROUND
-        if (chan->running)
+        if (chan->dev->cmd_timeout_workaround && chan->running)
                 set_transfer(chan, 0);
-#endif
 
         tasklet_kill(&chan->demux_tasklet);
 
diff --git a/drivers/media/dvb/ngene/ngene-dvb.c b/drivers/media/dvb/ngene/ngene-dvb.c
index 96013eb353cd..48f980b21d66 100644
--- a/drivers/media/dvb/ngene/ngene-dvb.c
+++ b/drivers/media/dvb/ngene/ngene-dvb.c
@@ -37,15 +37,12 @@
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
 #include <linux/timer.h>
-#include <linux/version.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
 #include <linux/vmalloc.h>
 
 #include "ngene.h"
 
-#define COMMAND_TIMEOUT_WORKAROUND
-
 
 /****************************************************************************/
 /* COMMAND API interface ****************************************************/
@@ -69,9 +66,7 @@ void *tsin_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags)
         struct ngene_channel *chan = priv;
 
 
-#ifdef COMMAND_TIMEOUT_WORKAROUND
         if (chan->users > 0)
-#endif
                 dvb_dmx_swfilter(&chan->demux, buf, len);
         return NULL;
 }
@@ -106,11 +101,8 @@ int ngene_start_feed(struct dvb_demux_feed *dvbdmxfeed)
         struct ngene_channel *chan = dvbdmx->priv;
 
         if (chan->users == 0) {
-#ifdef COMMAND_TIMEOUT_WORKAROUND
-                if (!chan->running)
-#endif
+                if (!chan->dev->cmd_timeout_workaround || !chan->running)
                         set_transfer(chan, 1);
-                /* msleep(10); */
         }
 
         return ++chan->users;
@@ -124,9 +116,8 @@ int ngene_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
         if (--chan->users)
                 return chan->users;
 
-#ifndef COMMAND_TIMEOUT_WORKAROUND
-        set_transfer(chan, 0);
-#endif
+        if (!chan->dev->cmd_timeout_workaround)
+                set_transfer(chan, 0);
 
         return 0;
 }
diff --git a/drivers/media/dvb/ngene/ngene-i2c.c b/drivers/media/dvb/ngene/ngene-i2c.c
index 2ef54ca6badd..477fe0aade86 100644
--- a/drivers/media/dvb/ngene/ngene-i2c.c
+++ b/drivers/media/dvb/ngene/ngene-i2c.c
@@ -39,7 +39,6 @@
 #include <linux/pci_ids.h>
 #include <linux/smp_lock.h>
 #include <linux/timer.h>
-#include <linux/version.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index 676fcbb79026..8fb4200f83f8 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -725,6 +725,8 @@ struct ngene {
         u32                   device_version;
         u32                   fw_interface_version;
         u32                   icounts;
+        bool                  msi_enabled;
+        bool                  cmd_timeout_workaround;
 
         u8                   *CmdDoneByte;
         int                   BootFirmware;
@@ -797,6 +799,7 @@ struct ngene_info {
 #define NGENE_VBOX_V2    7
 
         int   fw_version;
+        bool  msi_supported;
         char *name;
 
         int   io_type[MAX_STREAM];
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index d8d4214fd65f..32a7ec65ec42 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -68,13 +68,14 @@ config DVB_BUDGET
         select DVB_VES1820 if !DVB_FE_CUSTOMISE
         select DVB_L64781 if !DVB_FE_CUSTOMISE
         select DVB_TDA8083 if !DVB_FE_CUSTOMISE
-        select DVB_TDA10021 if !DVB_FE_CUSTOMISE
-        select DVB_TDA10023 if !DVB_FE_CUSTOMISE
         select DVB_S5H1420 if !DVB_FE_CUSTOMISE
         select DVB_TDA10086 if !DVB_FE_CUSTOMISE
         select DVB_TDA826X if !DVB_FE_CUSTOMISE
         select DVB_LNBP21 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
+        select DVB_ISL6423 if !DVB_FE_CUSTOMISE
+        select DVB_STV090x if !DVB_FE_CUSTOMISE
+        select DVB_STV6110x if !DVB_FE_CUSTOMISE
         help
           Support for simple SAA7146 based DVB cards (so called Budget-
           or Nova-PCI cards) without onboard MPEG2 decoder, and without
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 461714396331..13ac9e3ab121 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -215,6 +215,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
                 break;
         case 0x1010:
         case 0x1017:
+        case 0x1019:
         case 0x101a:
                 /* for the Technotrend 1500 bundled remote */
                 ir_codes = RC_MAP_TT_1500;