1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index f5d4a565346e..120f56857f0e 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -74,7 +74,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
         /* read gpio value */
         gpio = cx_read(ir->gpio_addr);
-        switch (core->board) {
+        switch (core->boardnr) {
         case CX88_BOARD_NPGTECH_REALTV_TOP10FM:
                 /* This board apparently uses a combination of 2 GPIO
                    to represent the keys. Additionally, the second GPIO
@@ -113,7 +113,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
                    (gpio & ir->mask_keydown) ? " down" : "",
                    (gpio & ir->mask_keyup) ? " up" : "");
 
-        if (ir->core->board == CX88_BOARD_NORWOOD_MICRO) {
+        if (ir->core->boardnr == CX88_BOARD_NORWOOD_MICRO) {
                 u32 gpio_key = cx_read(MO_GP0_IO);
 
                 data = (data << 4) | ((gpio_key & 0xf0) >> 4);
@@ -204,7 +204,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         ir->input = input_dev;
 
         /* detect & configure */
-        switch (core->board) {
+        switch (core->boardnr) {
         case CX88_BOARD_DNTV_LIVE_DVB_T:
         case CX88_BOARD_KWORLD_DVB_T:
         case CX88_BOARD_KWORLD_DVB_T_CX22702:
@@ -314,8 +314,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         }
 
         /* init input device */
-        snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)",
-                 cx88_boards[core->board].name);
+        snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
 
         ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
@@ -406,7 +405,7 @@ void cx88_ir_irq(struct cx88_core *core)
                 ir_dump_samples(ir->samples, ir->scount);
 
         /* decode it */
-        switch (core->board) {
+        switch (core->boardnr) {
         case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
         case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
                 ircode = ir_decode_pulsedistance(ir->samples, ir->scount, 1, 4);