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

Next file: linux/drivers/media/radio/radio-typhoon.c
Previous file: linux/drivers/media/radio/radio-terratec.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/media/radio/radio-trust.c linux/drivers/media/radio/radio-trust.c
@@ -300,14 +300,15 @@
 		printk(KERN_ERR "You must set an I/O address with io=0x???\n");
 		return -EINVAL;
 	}
-	if(check_region(io, 2)) {
+	if(request_region(io, 2, "Trust FM Radio")) {
 		printk(KERN_ERR "trust: port 0x%x already in use\n", io);
 		return -EBUSY;
 	}
 	if(video_register_device(&trust_radio, VFL_TYPE_RADIO)==-1)
+	{
+		release_region(io, 2);
 		return -EINVAL;
-		
-	request_region(io, 2, "Trust FM Radio");
+	}
 
 	printk(KERN_INFO "Trust FM Radio card driver v1.0.\n");
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)