diff options
| author | Dave Jones <davej@suse.de> | 2002-05-30 20:46:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-30 20:46:42 -0700 |
| commit | 4fdb04b767a8df7aaa5172670e4b77258a8999fb (patch) | |
| tree | a8adc2ae8a90df1abe425d59f766adf586bc0f43 | |
| parent | 8164693d14e919e32cf5eb3c89947bfcb68cbddf (diff) | |
[PATCH] isicom check_region() -> request_region()
| -rw-r--r-- | drivers/char/isicom.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 7ed6b1173d38..2d9c964d930e 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -1680,20 +1680,13 @@ static int register_ioregion(void) { int count, done=0; for (count=0; count < BOARD_COUNT; count++ ) { - if (isi_card[count].base) { - if (check_region(isi_card[count].base,16)) { + if (isi_card[count].base) + 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", isi_card[count].base,isi_card[count].base+15,count+1); 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++; } - } } return done; } |