aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/resource.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/resource.c')
-rw-r--r--drivers/pnp/resource.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 786fd356916d..55a57cded24a 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -98,13 +98,13 @@ int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option,
98 int i; 98 int i;
99 99
100 for (i = 0; i < 16; i++) 100 for (i = 0; i < 16; i++)
101 if (test_bit(i, data->map)) 101 if (test_bit(i, data->map.bits))
102 pcibios_penalize_isa_irq(i, 0); 102 pcibios_penalize_isa_irq(i, 0);
103 } 103 }
104#endif 104#endif
105 105
106#ifdef DEBUG 106#ifdef DEBUG
107 bitmap_scnprintf(buf, sizeof(buf), data->map, PNP_IRQ_NR); 107 bitmap_scnprintf(buf, sizeof(buf), data->map.bits, PNP_IRQ_NR);
108 dev_dbg(&dev->dev, " irq bitmask %s flags %#x\n", buf, 108 dev_dbg(&dev->dev, " irq bitmask %s flags %#x\n", buf,
109 data->flags); 109 data->flags);
110#endif 110#endif
@@ -653,7 +653,7 @@ static int pnp_possible_option(struct pnp_option *option, int type,
653 case IORESOURCE_IRQ: 653 case IORESOURCE_IRQ:
654 for (irq = tmp->irq; irq; irq = irq->next) { 654 for (irq = tmp->irq; irq; irq = irq->next) {
655 if (start < PNP_IRQ_NR && 655 if (start < PNP_IRQ_NR &&
656 test_bit(start, irq->map)) 656 test_bit(start, irq->map.bits))
657 return 1; 657 return 1;
658 } 658 }
659 break; 659 break;