patch-2.3.99-pre7 linux/drivers/char/radio-cadet.c

• Lines: 36
• Date: Wed May 3 01:45:19 2000
• Orig file: v2.3.99-pre6/linux/drivers/char/radio-cadet.c
• Orig date: Fri Jan 21 18:19:16 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/char/radio-cadet.c linux/drivers/char/radio-cadet.c
@@ -39,7 +39,6 @@
 static __u8 rdsin=0,rdsout=0,rdsstat=0;
 static unsigned char rdsbuf[RDS_BUFFER];
 static int cadet_lock=0;
-static int cadet_probe(void);
 
 /*
  * Signal Strength Threshold Values
@@ -562,7 +561,7 @@
 }
 #endif
 
-int __init cadet_init(void)
+static int __init cadet_init(void)
 {
 #ifndef MODULE        
 	io = cadet_probe ();
@@ -572,12 +571,14 @@
 #ifdef MODULE        
 		printk(KERN_ERR "You must set an I/O address with io=0x???\n");
 #endif
-	        return EINVAL;
+	        return -EINVAL;
 	}
-	if(video_register_device(&cadet_radio,VFL_TYPE_RADIO)==-1)
+	if (!request_region(io,2,"cadet"))
+		return -EBUSY;
+	if(video_register_device(&cadet_radio,VFL_TYPE_RADIO)==-1) {
+		release_region(io,2);
 		return -EINVAL;
-		
-	request_region(io,2,"cadet");
+	}
 	printk(KERN_INFO "ADS Cadet Radio Card at 0x%x\n",io);
 	return 0;
 }