aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/act2000/module.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/act2000/module.c')
-rw-r--r--drivers/isdn/act2000/module.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c
index 8325022e2bed..f774e12bb64d 100644
--- a/drivers/isdn/act2000/module.c
+++ b/drivers/isdn/act2000/module.c
@@ -23,7 +23,6 @@ static unsigned short act2000_isa_ports[] =
23 0x0200, 0x0240, 0x0280, 0x02c0, 0x0300, 0x0340, 0x0380, 23 0x0200, 0x0240, 0x0280, 0x02c0, 0x0300, 0x0340, 0x0380,
24 0xcfe0, 0xcfa0, 0xcf60, 0xcf20, 0xcee0, 0xcea0, 0xce60, 24 0xcfe0, 0xcfa0, 0xcf60, 0xcf20, 0xcee0, 0xcea0, 0xce60,
25}; 25};
26#define ISA_NRPORTS (sizeof(act2000_isa_ports)/sizeof(unsigned short))
27 26
28static act2000_card *cards = (act2000_card *) NULL; 27static act2000_card *cards = (act2000_card *) NULL;
29 28
@@ -686,21 +685,21 @@ act2000_addcard(int bus, int port, int irq, char *id)
686 * This may result in more than one card detected. 685 * This may result in more than one card detected.
687 */ 686 */
688 switch (bus) { 687 switch (bus) {
689 case ACT2000_BUS_ISA: 688 case ACT2000_BUS_ISA:
690 for (i = 0; i < ISA_NRPORTS; i++) 689 for (i = 0; i < ARRAY_SIZE(act2000_isa_ports); i++)
691 if (act2000_isa_detect(act2000_isa_ports[i])) { 690 if (act2000_isa_detect(act2000_isa_ports[i])) {
692 printk(KERN_INFO 691 printk(KERN_INFO "act2000: Detected "
693 "act2000: Detected ISA card at port 0x%x\n", 692 "ISA card at port 0x%x\n",
694 act2000_isa_ports[i]); 693 act2000_isa_ports[i]);
695 act2000_alloccard(bus, act2000_isa_ports[i], irq, id); 694 act2000_alloccard(bus,
696 } 695 act2000_isa_ports[i], irq, id);
697 break; 696 }
698 case ACT2000_BUS_MCA: 697 break;
699 case ACT2000_BUS_PCMCIA: 698 case ACT2000_BUS_MCA:
700 default: 699 case ACT2000_BUS_PCMCIA:
701 printk(KERN_WARNING 700 default:
702 "act2000: addcard: Invalid BUS type %d\n", 701 printk(KERN_WARNING
703 bus); 702 "act2000: addcard: Invalid BUS type %d\n", bus);
704 } 703 }
705 } 704 }
706 if (!cards) 705 if (!cards)