6 files changed, 238 insertions, 152 deletions

diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 95531a624991..eec7ccf41f8b 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -92,6 +92,7 @@ config DVB_BUDGET_CI
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_LNBP21 if !DVB_FE_CUSTOMISE
+        select VIDEO_IR
         help
           Support for simple SAA7146 based DVB cards
           (so called Budget- or Nova-PCI cards) without onboard
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index bba23bcd1b11..366c1371ee97 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2828,7 +2828,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 static struct saa7146_extension av7110_extension = {
         .name           = "dvb",
-        .flags          = SAA7146_I2C_SHORT_DELAY,
+        .flags          = SAA7146_USE_I2C_IRQ,
 
         .module         = THIS_MODULE,
         .pci_tbl        = &pci_tbl[0],
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index d54bbcdde2cc..e4544ea2b89b 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -48,7 +48,8 @@ static void av7110_emit_keyup(unsigned long data)
         if (!data || !test_bit(data, input_dev->key))
                 return;
 
-        input_event(input_dev, EV_KEY, data, !!0);
+        input_report_key(input_dev, data, 0);
+        input_sync(input_dev);
 }
 
 
@@ -115,14 +116,17 @@ static void av7110_emit_key(unsigned long parm)
                 del_timer(&keyup_timer);
                 if (keyup_timer.data != keycode || new_toggle != old_toggle) {
                         delay_timer_finished = 0;
-                        input_event(input_dev, EV_KEY, keyup_timer.data, !!0);
-                        input_event(input_dev, EV_KEY, keycode, !0);
-                } else
-                        if (delay_timer_finished)
-                                input_event(input_dev, EV_KEY, keycode, 2);
+                        input_event(input_dev, EV_KEY, keyup_timer.data, 0);
+                        input_event(input_dev, EV_KEY, keycode, 1);
+                        input_sync(input_dev);
+                } else if (delay_timer_finished) {
+                        input_event(input_dev, EV_KEY, keycode, 2);
+                        input_sync(input_dev);
+                }
         } else {
                 delay_timer_finished = 0;
-                input_event(input_dev, EV_KEY, keycode, !0);
+                input_event(input_dev, EV_KEY, keycode, 1);
+                input_sync(input_dev);
         }
 
         keyup_timer.expires = jiffies + UP_TIMEOUT;
@@ -211,6 +215,7 @@ static void ir_handler(struct av7110 *av7110, u32 ircom)
 int __devinit av7110_ir_init(struct av7110 *av7110)
 {
         static struct proc_dir_entry *e;
+        int err;
 
         if (av_cnt >= sizeof av_list/sizeof av_list[0])
                 return -ENOSPC;
@@ -231,7 +236,11 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
                 set_bit(EV_KEY, input_dev->evbit);
                 set_bit(EV_REP, input_dev->evbit);
                 input_register_keys();
-                input_register_device(input_dev);
+                err = input_register_device(input_dev);
+                if (err) {
+                        input_free_device(input_dev);
+                        return err;
+                }
                 input_dev->timer.function = input_repeat_key;
 
                 e = create_proc_entry("av7110_ir", S_IFREG | S_IRUGO | S_IWUSR, NULL);
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 2235ff8b8a1d..89ab4b59155c 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -360,7 +360,7 @@ static int ciintf_init(struct budget_av *budget_av)
         saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
 
         /* Enable DEBI pins */
-        saa7146_write(saa, MC1, saa7146_read(saa, MC1) | (0x800 << 16) | 0x800);
+        saa7146_write(saa, MC1, MASK_27 | MASK_11);
 
         /* register CI interface */
         budget_av->ca.owner = THIS_MODULE;
@@ -386,7 +386,7 @@ static int ciintf_init(struct budget_av *budget_av)
         return 0;
 
 error:
-        saa7146_write(saa, MC1, saa7146_read(saa, MC1) | (0x800 << 16));
+        saa7146_write(saa, MC1, MASK_27);
         return result;
 }
 
@@ -403,7 +403,7 @@ static void ciintf_deinit(struct budget_av *budget_av)
         dvb_ca_en50221_release(&budget_av->ca);
 
         /* disable DEBI pins */
-        saa7146_write(saa, MC1, saa7146_read(saa, MC1) | (0x800 << 16));
+        saa7146_write(saa, MC1, MASK_27);
 }
 
 
@@ -655,6 +655,10 @@ static struct tda10021_config philips_cu1216_config = {
         .demod_address = 0x0c,
 };
 
+static struct tda10021_config philips_cu1216_config_altaddress = {
+        .demod_address = 0x0d,
+};
+
 
 
 
@@ -831,7 +835,7 @@ static int philips_sd1878_tda8261_tuner_set_params(struct dvb_frontend *fe,
                 return -EINVAL;
 
         rc=dvb_pll_configure(&dvb_pll_philips_sd1878_tda8261, buf,
-                        params->frequency, 0);
+                             params->frequency, 0);
         if(rc < 0) return rc;
 
         if (fe->ops.i2c_gate_ctrl)
@@ -914,6 +918,7 @@ static u8 read_pwm(struct budget_av *budget_av)
 #define SUBID_DVBS_TV_STAR_CI   0x0016
 #define SUBID_DVBS_EASYWATCH_1  0x001a
 #define SUBID_DVBS_EASYWATCH    0x001e
+#define SUBID_DVBC_EASYWATCH    0x002a
 #define SUBID_DVBC_KNC1         0x0020
 #define SUBID_DVBC_KNC1_PLUS    0x0021
 #define SUBID_DVBC_CINERGY1200  0x1156
@@ -947,11 +952,15 @@ static void frontend_init(struct budget_av *budget_av)
         /* Enable / PowerON Frontend */
         saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
 
+        /* Wait for PowerON */
+        msleep(100);
+
         /* additional setup necessary for the PLUS cards */
         switch (saa->pci->subsystem_device) {
                 case SUBID_DVBS_KNC1_PLUS:
                 case SUBID_DVBC_KNC1_PLUS:
                 case SUBID_DVBT_KNC1_PLUS:
+                case SUBID_DVBC_EASYWATCH:
                         saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTHI);
                         break;
         }
@@ -1006,10 +1015,15 @@ static void frontend_init(struct budget_av *budget_av)
         case SUBID_DVBC_KNC1:
         case SUBID_DVBC_KNC1_PLUS:
         case SUBID_DVBC_CINERGY1200:
+        case SUBID_DVBC_EASYWATCH:
                 budget_av->reinitialise_demod = 1;
                 fe = dvb_attach(tda10021_attach, &philips_cu1216_config,
                                      &budget_av->budget.i2c_adap,
                                      read_pwm(budget_av));
+                if (fe == NULL)
+                        fe = dvb_attach(tda10021_attach, &philips_cu1216_config_altaddress,
+                                             &budget_av->budget.i2c_adap,
+                                             read_pwm(budget_av));
                 if (fe) {
                         budget_av->tda10021_poclkp = 1;
                         budget_av->tda10021_set_frontend = fe->ops.set_frontend;
@@ -1242,6 +1256,7 @@ MAKE_BUDGET_INFO(knc1t, "KNC1 DVB-T", BUDGET_KNC1T);
 MAKE_BUDGET_INFO(kncxs, "KNC TV STAR DVB-S", BUDGET_TVSTAR);
 MAKE_BUDGET_INFO(satewpls, "Satelco EasyWatch DVB-S light", BUDGET_TVSTAR);
 MAKE_BUDGET_INFO(satewpls1, "Satelco EasyWatch DVB-S light", BUDGET_KNC1S);
+MAKE_BUDGET_INFO(satewplc, "Satelco EasyWatch DVB-C", BUDGET_KNC1CP);
 MAKE_BUDGET_INFO(knc1sp, "KNC1 DVB-S Plus", BUDGET_KNC1SP);
 MAKE_BUDGET_INFO(knc1cp, "KNC1 DVB-C Plus", BUDGET_KNC1CP);
 MAKE_BUDGET_INFO(knc1tp, "KNC1 DVB-T Plus", BUDGET_KNC1TP);
@@ -1260,6 +1275,7 @@ static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(kncxs, 0x1894, 0x0016),
         MAKE_EXTENSION_PCI(satewpls, 0x1894, 0x001e),
         MAKE_EXTENSION_PCI(satewpls1, 0x1894, 0x001a),
+        MAKE_EXTENSION_PCI(satewplc, 0x1894, 0x002a),
         MAKE_EXTENSION_PCI(knc1c, 0x1894, 0x0020),
         MAKE_EXTENSION_PCI(knc1cp, 0x1894, 0x0021),
         MAKE_EXTENSION_PCI(knc1t, 0x1894, 0x0030),
@@ -1277,7 +1293,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 static struct saa7146_extension budget_extension = {
         .name = "budget_av",
-        .flags = SAA7146_I2C_SHORT_DELAY,
+        .flags = SAA7146_USE_I2C_IRQ,
 
         .pci_tbl = pci_tbl,
 
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index cd5ec489af1c..f2066b47baee 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -37,6 +37,7 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/spinlock.h>
+#include <media/ir-common.h>
 
 #include "dvb_ca_en50221.h"
 #include "stv0299.h"
@@ -72,162 +73,218 @@
 #define SLOTSTATUS_READY        8
 #define SLOTSTATUS_OCCUPIED     (SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY)
 
+/* Milliseconds during which key presses are regarded as key repeat and during
+ * which the debounce logic is active
+ */
+#define IR_REPEAT_TIMEOUT       350
+
+/* RC5 device wildcard */
+#define IR_DEVICE_ANY           255
+
+/* Some remotes sends multiple sequences per keypress (e.g. Zenith sends two),
+ * this setting allows the superflous sequences to be ignored
+ */
+static int debounce = 0;
+module_param(debounce, int, 0644);
+MODULE_PARM_DESC(debounce, "ignore repeated IR sequences (default: 0 = ignore no sequences)");
+
+static int rc5_device = -1;
+module_param(rc5_device, int, 0644);
+MODULE_PARM_DESC(rc5_device, "only IR commands to given RC5 device (device = 0 - 31, any device = 255, default: autodetect)");
+
+static int ir_debug = 0;
+module_param(ir_debug, int, 0644);
+MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");
+
+struct budget_ci_ir {
+        struct input_dev *dev;
+        struct tasklet_struct msp430_irq_tasklet;
+        char name[72]; /* 40 + 32 for (struct saa7146_dev).name */
+        char phys[32];
+        struct ir_input_state state;
+        int rc5_device;
+};
+
 struct budget_ci {
         struct budget budget;
-        struct input_dev *input_dev;
-        struct tasklet_struct msp430_irq_tasklet;
         struct tasklet_struct ciintf_irq_tasklet;
         int slot_status;
         int ci_irq;
         struct dvb_ca_en50221 ca;
-        char ir_dev_name[50];
+        struct budget_ci_ir ir;
         u8 tuner_pll_address; /* used for philips_tdm1316l configs */
 };
 
-/* from reading the following remotes:
-   Zenith Universal 7 / TV Mode 807 / VCR Mode 837
-   Hauppauge (from NOVA-CI-s box product)
-   i've taken a "middle of the road" approach and note the differences
-*/
-static u16 key_map[64] = {
-        /* 0x0X */
-        KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8,
-        KEY_9,
-        KEY_ENTER,
-        KEY_RED,
-        KEY_POWER,              /* RADIO on Hauppauge */
-        KEY_MUTE,
-        0,
-        KEY_A,                  /* TV on Hauppauge */
-        /* 0x1X */
-        KEY_VOLUMEUP, KEY_VOLUMEDOWN,
-        0, 0,
-        KEY_B,
-        0, 0, 0, 0, 0, 0, 0,
-        KEY_UP, KEY_DOWN,
-        KEY_OPTION,             /* RESERVED on Hauppauge */
-        KEY_BREAK,
-        /* 0x2X */
-        KEY_CHANNELUP, KEY_CHANNELDOWN,
-        KEY_PREVIOUS,           /* Prev. Ch on Zenith, SOURCE on Hauppauge */
-        0, KEY_RESTART, KEY_OK,
-        KEY_CYCLEWINDOWS,       /* MINIMIZE on Hauppauge */
-        0,
-        KEY_ENTER,              /* VCR mode on Zenith */
-        KEY_PAUSE,
-        0,
-        KEY_RIGHT, KEY_LEFT,
-        0,
-        KEY_MENU,               /* FULL SCREEN on Hauppauge */
-        0,
-        /* 0x3X */
-        KEY_SLOW,
-        KEY_PREVIOUS,           /* VCR mode on Zenith */
-        KEY_REWIND,
-        0,
-        KEY_FASTFORWARD,
-        KEY_PLAY, KEY_STOP,
-        KEY_RECORD,
-        KEY_TUNER,              /* TV/VCR on Zenith */
-        0,
-        KEY_C,
-        0,
-        KEY_EXIT,
-        KEY_POWER2,
-        KEY_TUNER,              /* VCR mode on Zenith */
-        0,
-};
-
-static void msp430_ir_debounce(unsigned long data)
+static void msp430_ir_keyup(unsigned long data)
 {
-        struct input_dev *dev = (struct input_dev *) data;
-
-        if (dev->rep[0] == 0 || dev->rep[0] == ~0) {
-                input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
-                return;
-        }
-
-        dev->rep[0] = 0;
-        dev->timer.expires = jiffies + HZ * 350 / 1000;
-        add_timer(&dev->timer);
-        input_event(dev, EV_KEY, key_map[dev->repeat_key], 2);  /* REPEAT */
+        struct budget_ci_ir *ir = (struct budget_ci_ir *) data;
+        ir_input_nokey(ir->dev, &ir->state);
 }
 
 static void msp430_ir_interrupt(unsigned long data)
 {
         struct budget_ci *budget_ci = (struct budget_ci *) data;
-        struct input_dev *dev = budget_ci->input_dev;
-        unsigned int code =
-                ttpci_budget_debiread(&budget_ci->budget, DEBINOSWAP, DEBIADDR_IR, 2, 1, 0) >> 8;
+        struct input_dev *dev = budget_ci->ir.dev;
+        static int bounces = 0;
+        int device;
+        int toggle;
+        static int prev_toggle = -1;
+        static u32 ir_key;
+        u32 command = ttpci_budget_debiread(&budget_ci->budget, DEBINOSWAP, DEBIADDR_IR, 2, 1, 0) >> 8;
+
+        /*
+         * The msp430 chip can generate two different bytes, command and device
+         *
+         * type1: X1CCCCCC, C = command bits (0 - 63)
+         * type2: X0TDDDDD, D = device bits (0 - 31), T = RC5 toggle bit
+         *
+         * More than one command byte may be generated before the device byte
+         * Only when we have both, a correct keypress is generated
+         */
+
+        /* Is this a RC5 command byte? */
+        if (command & 0x40) {
+                if (ir_debug)
+                        printk("budget_ci: received command byte 0x%02x\n", command);
+                ir_key = command & 0x3f;
+                return;
+        }
 
-        if (code & 0x40) {
-                code &= 0x3f;
+        /* It's a RC5 device byte */
+        if (ir_debug)
+                printk("budget_ci: received device byte 0x%02x\n", command);
+        device = command & 0x1f;
+        toggle = command & 0x20;
 
-                if (timer_pending(&dev->timer)) {
-                        if (code == dev->repeat_key) {
-                                ++dev->rep[0];
-                                return;
-                        }
-                        del_timer(&dev->timer);
-                        input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
-                }
+        if (budget_ci->ir.rc5_device != IR_DEVICE_ANY && budget_ci->ir.rc5_device != device)
+                return;
 
-                if (!key_map[code]) {
-                        printk("DVB (%s): no key for %02x!\n", __FUNCTION__, code);
-                        return;
-                }
+        /* Ignore repeated key sequences if requested */
+        if (toggle == prev_toggle && ir_key == dev->repeat_key &&
+            bounces > 0 && timer_pending(&dev->timer)) {
+                if (ir_debug)
+                        printk("budget_ci: debounce logic ignored IR command\n");
+                bounces--;
+                return;
+        }
+        prev_toggle = toggle;
 
-                /* initialize debounce and repeat */
-                dev->repeat_key = code;
-                /* Zenith remote _always_ sends 2 sequences */
-                dev->rep[0] = ~0;
-                /* 350 milliseconds */
-                dev->timer.expires = jiffies + HZ * 350 / 1000;
-                /* MAKE */
-                input_event(dev, EV_KEY, key_map[code], !0);
-                add_timer(&dev->timer);
+        /* Are we still waiting for a keyup event? */
+        if (del_timer(&dev->timer))
+                ir_input_nokey(dev, &budget_ci->ir.state);
+
+        /* Generate keypress */
+        if (ir_debug)
+                printk("budget_ci: generating keypress 0x%02x\n", ir_key);
+        ir_input_keydown(dev, &budget_ci->ir.state, ir_key, (ir_key & (command << 8)));
+
+        /* Do we want to delay the keyup event? */
+        if (debounce) {
+                bounces = debounce;
+                mod_timer(&dev->timer, jiffies + msecs_to_jiffies(IR_REPEAT_TIMEOUT));
+        } else {
+                ir_input_nokey(dev, &budget_ci->ir.state);
         }
 }
 
 static int msp430_ir_init(struct budget_ci *budget_ci)
 {
         struct saa7146_dev *saa = budget_ci->budget.dev;
-        struct input_dev *input_dev;
-        int i;
+        struct input_dev *input_dev = budget_ci->ir.dev;
+        int error;
+
+        budget_ci->ir.dev = input_dev = input_allocate_device();
+        if (!input_dev) {
+                printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");
+                error = -ENOMEM;
+                goto out1;
+        }
+
+        snprintf(budget_ci->ir.name, sizeof(budget_ci->ir.name),
+                 "Budget-CI dvb ir receiver %s", saa->name);
+        snprintf(budget_ci->ir.phys, sizeof(budget_ci->ir.phys),
+                 "pci-%s/ir0", pci_name(saa->pci));
 
-        budget_ci->input_dev = input_dev = input_allocate_device();
-        if (!input_dev)
-                return -ENOMEM;
+        input_dev->name = budget_ci->ir.name;
 
-        sprintf(budget_ci->ir_dev_name, "Budget-CI dvb ir receiver %s", saa->name);
+        input_dev->phys = budget_ci->ir.phys;
+        input_dev->id.bustype = BUS_PCI;
+        input_dev->id.version = 1;
+        if (saa->pci->subsystem_vendor) {
+                input_dev->id.vendor = saa->pci->subsystem_vendor;
+                input_dev->id.product = saa->pci->subsystem_device;
+        } else {
+                input_dev->id.vendor = saa->pci->vendor;
+                input_dev->id.product = saa->pci->device;
+        }
+        input_dev->cdev.dev = &saa->pci->dev;
 
-        input_dev->name = budget_ci->ir_dev_name;
+        /* Select keymap and address */
+        switch (budget_ci->budget.dev->pci->subsystem_device) {
+        case 0x100c:
+        case 0x100f:
+        case 0x1010:
+        case 0x1011:
+        case 0x1012:
+        case 0x1017:
+                /* The hauppauge keymap is a superset of these remotes */
+                ir_input_init(input_dev, &budget_ci->ir.state,
+                              IR_TYPE_RC5, ir_codes_hauppauge_new);
+
+                if (rc5_device < 0)
+                        budget_ci->ir.rc5_device = 0x1f;
+                else
+                        budget_ci->ir.rc5_device = rc5_device;
+                break;
+        default:
+                /* unknown remote */
+                ir_input_init(input_dev, &budget_ci->ir.state,
+                              IR_TYPE_RC5, ir_codes_budget_ci_old);
+
+                if (rc5_device < 0)
+                        budget_ci->ir.rc5_device = IR_DEVICE_ANY;
+                else
+                        budget_ci->ir.rc5_device = rc5_device;
+                break;
+        }
 
-        set_bit(EV_KEY, input_dev->evbit);
-        for (i = 0; i < ARRAY_SIZE(key_map); i++)
-                if (key_map[i])
-                        set_bit(key_map[i], input_dev->keybit);
+        /* initialise the key-up debounce timeout handler */
+        input_dev->timer.function = msp430_ir_keyup;
+        input_dev->timer.data = (unsigned long) &budget_ci->ir;
 
-        input_register_device(budget_ci->input_dev);
+        error = input_register_device(input_dev);
+        if (error) {
+                printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error);
+                goto out2;
+        }
 
-        input_dev->timer.function = msp430_ir_debounce;
+        tasklet_init(&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt,
+                     (unsigned long) budget_ci);
 
-        saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_06);
+        SAA7146_IER_ENABLE(saa, MASK_06);
         saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI);
 
         return 0;
+
+out2:
+        input_free_device(input_dev);
+out1:
+        return error;
 }
 
 static void msp430_ir_deinit(struct budget_ci *budget_ci)
 {
         struct saa7146_dev *saa = budget_ci->budget.dev;
-        struct input_dev *dev = budget_ci->input_dev;
+        struct input_dev *dev = budget_ci->ir.dev;
 
-        saa7146_write(saa, IER, saa7146_read(saa, IER) & ~MASK_06);
+        SAA7146_IER_DISABLE(saa, MASK_06);
         saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
+        tasklet_kill(&budget_ci->ir.msp430_irq_tasklet);
 
-        if (del_timer(&dev->timer))
-                input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
+        if (del_timer(&dev->timer)) {
+                ir_input_nokey(dev, &budget_ci->ir.state);
+                input_sync(dev);
+        }
 
         input_unregister_device(dev);
 }
@@ -428,7 +485,7 @@ static int ciintf_init(struct budget_ci *budget_ci)
         memset(&budget_ci->ca, 0, sizeof(struct dvb_ca_en50221));
 
         // enable DEBI pins
-        saa7146_write(saa, MC1, saa7146_read(saa, MC1) | (0x800 << 16) | 0x800);
+        saa7146_write(saa, MC1, MASK_27 | MASK_11);
 
         // test if it is there
         ci_version = ttpci_budget_debiread(&budget_ci->budget, DEBICICTL, DEBIADDR_CIVERSION, 1, 1, 0);
@@ -480,7 +537,7 @@ static int ciintf_init(struct budget_ci *budget_ci)
                 } else {
                         saa7146_setgpio(saa, 0, SAA7146_GPIO_IRQHI);
                 }
-                saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_03);
+                SAA7146_IER_ENABLE(saa, MASK_03);
         }
 
         // enable interface
@@ -502,7 +559,7 @@ static int ciintf_init(struct budget_ci *budget_ci)
         return 0;
 
 error:
-        saa7146_write(saa, MC1, saa7146_read(saa, MC1) | (0x800 << 16));
+        saa7146_write(saa, MC1, MASK_27);
         return result;
 }
 
@@ -512,7 +569,7 @@ static void ciintf_deinit(struct budget_ci *budget_ci)
 
         // disable CI interrupts
         if (budget_ci->ci_irq) {
-                saa7146_write(saa, IER, saa7146_read(saa, IER) & ~MASK_03);
+                SAA7146_IER_DISABLE(saa, MASK_03);
                 saa7146_setgpio(saa, 0, SAA7146_GPIO_INPUT);
                 tasklet_kill(&budget_ci->ciintf_irq_tasklet);
         }
@@ -530,7 +587,7 @@ static void ciintf_deinit(struct budget_ci *budget_ci)
         dvb_ca_en50221_release(&budget_ci->ca);
 
         // disable DEBI pins
-        saa7146_write(saa, MC1, saa7146_read(saa, MC1) | (0x800 << 16));
+        saa7146_write(saa, MC1, MASK_27);
 }
 
 static void budget_ci_irq(struct saa7146_dev *dev, u32 * isr)
@@ -540,7 +597,7 @@ static void budget_ci_irq(struct saa7146_dev *dev, u32 * isr)
         dprintk(8, "dev: %p, budget_ci: %p\n", dev, budget_ci);
 
         if (*isr & MASK_06)
-                tasklet_schedule(&budget_ci->msp430_irq_tasklet);
+                tasklet_schedule(&budget_ci->ir.msp430_irq_tasklet);
 
         if (*isr & MASK_10)
                 ttpci_budget_irq10_handler(dev, isr);
@@ -835,7 +892,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
                 band = 1;
         } else if (tuner_frequency < 200000000) {
                 cp = 6;
-                band = 1;
+                band = 2;
         } else if (tuner_frequency < 290000000) {
                 cp = 3;
                 band = 2;
@@ -1083,24 +1140,23 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
         struct budget_ci *budget_ci;
         int err;
 
-        if (!(budget_ci = kmalloc(sizeof(struct budget_ci), GFP_KERNEL)))
-                return -ENOMEM;
+        budget_ci = kzalloc(sizeof(struct budget_ci), GFP_KERNEL);
+        if (!budget_ci) {
+                err = -ENOMEM;
+                goto out1;
+        }
 
         dprintk(2, "budget_ci: %p\n", budget_ci);
 
-        budget_ci->budget.ci_present = 0;
-
         dev->ext_priv = budget_ci;
 
-        if ((err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE))) {
-                kfree(budget_ci);
-                return err;
-        }
-
-        tasklet_init(&budget_ci->msp430_irq_tasklet, msp430_ir_interrupt,
-                     (unsigned long) budget_ci);
+        err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE);
+        if (err)
+                goto out2;
 
-        msp430_ir_init(budget_ci);
+        err = msp430_ir_init(budget_ci);
+        if (err)
+                goto out3;
 
         ciintf_init(budget_ci);
 
@@ -1110,6 +1166,13 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
         ttpci_budget_init_hooks(&budget_ci->budget);
 
         return 0;
+
+out3:
+        ttpci_budget_deinit(&budget_ci->budget);
+out2:
+        kfree(budget_ci);
+out1:
+        return err;
 }
 
 static int budget_ci_detach(struct saa7146_dev *dev)
@@ -1120,16 +1183,13 @@ static int budget_ci_detach(struct saa7146_dev *dev)
 
         if (budget_ci->budget.ci_present)
                 ciintf_deinit(budget_ci);
+        msp430_ir_deinit(budget_ci);
         if (budget_ci->budget.dvb_frontend) {
                 dvb_unregister_frontend(budget_ci->budget.dvb_frontend);
                 dvb_frontend_detach(budget_ci->budget.dvb_frontend);
         }
         err = ttpci_budget_deinit(&budget_ci->budget);
 
-        tasklet_kill(&budget_ci->msp430_irq_tasklet);
-
-        msp430_ir_deinit(budget_ci);
-
         // disable frontend and CI interface
         saa7146_setgpio(saa, 2, SAA7146_GPIO_INPUT);
 
@@ -1162,7 +1222,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 static struct saa7146_extension budget_extension = {
         .name = "budget_ci dvb",
-        .flags = SAA7146_I2C_SHORT_DELAY,
+        .flags = SAA7146_USE_I2C_IRQ,
 
         .module = THIS_MODULE,
         .pci_tbl = &pci_tbl[0],
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 56f1c80defc6..9268a82bada6 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -555,7 +555,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 static struct saa7146_extension budget_extension = {
         .name           = "budget dvb",
-        .flags          = SAA7146_I2C_SHORT_DELAY,
+        .flags          = SAA7146_USE_I2C_IRQ,
 
         .module         = THIS_MODULE,
         .pci_tbl        = pci_tbl,