patch-2.4.0-test12 linux/drivers/media/radio/radio-aimslab.c

• Lines: 22
• Date: Mon Nov 27 17:47:38 2000
• Orig file: v2.4.0-test11/linux/drivers/media/radio/radio-aimslab.c
• Orig date: Sun Nov 19 18:44:08 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/media/radio/radio-aimslab.c linux/drivers/media/radio/radio-aimslab.c
@@ -338,7 +338,7 @@
 		return -EINVAL;
 	}
 
-	if (check_region(io, 2)) 
+	if (request_region(io, 2, "rtrack")) 
 	{
 		printk(KERN_ERR "rtrack: port 0x%x already in use\n", io);
 		return -EBUSY;
@@ -347,9 +347,10 @@
 	rtrack_radio.priv=&rtrack_unit;
 	
 	if(video_register_device(&rtrack_radio, VFL_TYPE_RADIO)==-1)
+	{
+		release_region(io, 2);
 		return -EINVAL;
-		
-	request_region(io, 2, "rtrack");
+	}
 	printk(KERN_INFO "AIMSlab RadioTrack/RadioReveal card driver.\n");
 
 	/* Set up the I/O locking */