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

4fdb04b7 · Dave Jones · Linus Torvalds · 8164693d · 4fdb04b7
Commit 4fdb04b7 authored May 30, 2002 by Dave Jones Committed by Linus Torvalds May 30, 2002
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

drivers/char/isicom.c drivers/char/isicom.c +2 -9

No files found.
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1680,21 +1680,14 @@ static int register_ioregion(void)
 {
 	int count, done=0;
 	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",
 					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;
 }