Merge branches 'stable/balloon.cleanup' and 'stable/general.cleanup' of git://git...

[pandora-kernel.git] / drivers / media / video / cx88 / cx88-input.c

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 06f7d1d..3f44200 100644 (file)
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -283,7 +283,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        case CX88_BOARD_PCHDTV_HD3000:
        case CX88_BOARD_PCHDTV_HD5500:
        case CX88_BOARD_HAUPPAUGE_IRONLY:
-               ir_codes = RC_MAP_HAUPPAUGE_NEW;
+               ir_codes = RC_MAP_HAUPPAUGE;
                ir->sampling = 1;
                break;
        case CX88_BOARD_WINFAST_DTV2000H:
@@ -373,6 +373,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                ir_codes = RC_MAP_TBS_NEC;
                ir->sampling = 0xff00; /* address */
                break;
+       case CX88_BOARD_TEVII_S464:
        case CX88_BOARD_TEVII_S460:
        case CX88_BOARD_TEVII_S420:
                ir_codes = RC_MAP_TEVII_NEC;
@@ -523,7 +524,7 @@ void cx88_ir_irq(struct cx88_core *core)
        for (todo = 32; todo > 0; todo -= bits) {
                ev.pulse = samples & 0x80000000 ? false : true;
                bits = min(todo, 32U - fls(ev.pulse ? samples : ~samples));
-               ev.duration = (bits * NSEC_PER_SEC) / (1000 * ir_samplerate);
+               ev.duration = (bits * (NSEC_PER_SEC / 1000)) / ir_samplerate;
                ir_raw_event_store_with_filter(ir->dev, &ev);
                samples <<= bits;
        }
@@ -603,7 +604,7 @@ void cx88_i2c_init_ir(struct cx88_core *core)
                if (*addrp == 0x71) {
                        /* Hauppauge XVR */
                        core->init_data.name = "cx88 Hauppauge XVR remote";
-                       core->init_data.ir_codes = RC_MAP_HAUPPAUGE_NEW;
+                       core->init_data.ir_codes = RC_MAP_HAUPPAUGE;
                        core->init_data.type = RC_TYPE_RC5;
                        core->init_data.internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;