Commit 4fdb04b7 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] isicom check_region() -> request_region()

parent 8164693d
...@@ -1680,21 +1680,14 @@ static int register_ioregion(void) ...@@ -1680,21 +1680,14 @@ static int register_ioregion(void)
{ {
int count, done=0; int count, done=0;
for (count=0; count < BOARD_COUNT; count++ ) { for (count=0; count < BOARD_COUNT; count++ ) {
if (isi_card[count].base) { if (isi_card[count].base)
if (check_region(isi_card[count].base,16)) { if (!request_region(isi_card[count].base,16,ISICOM_NAME)) {
printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x is busy. Card%d will be disabled.\n", printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x is busy. Card%d will be disabled.\n",
isi_card[count].base,isi_card[count].base+15,count+1); isi_card[count].base,isi_card[count].base+15,count+1);
isi_card[count].base=0; isi_card[count].base=0;
}
else {
request_region(isi_card[count].base,16,ISICOM_NAME);
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: I/O Region 0x%x-0x%x requested for Card%d.\n",isi_card[count].base,isi_card[count].base+15,count+1);
#endif
done++; done++;
} }
} }
}
return done; return done;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment