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

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

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/media/radio/radio-typhoon.c linux/drivers/media/radio/radio-typhoon.c
@@ -350,7 +350,7 @@
 
 	printk(KERN_INFO BANNER);
 	io = typhoon_unit.iobase;
-	if (check_region(io, 8)) {
+	if (request_region(io, 8, "typhoon")) {
 		printk(KERN_ERR "radio-typhoon: port 0x%x already in use\n",
 		       typhoon_unit.iobase);
 		return -EBUSY;
@@ -358,9 +358,10 @@
 
 	typhoon_radio.priv = &typhoon_unit;
 	if (video_register_device(&typhoon_radio, VFL_TYPE_RADIO) == -1)
+	{
+		release_region(io, 8);
 		return -EINVAL;
-
-	request_region(typhoon_unit.iobase, 8, "typhoon");
+	}
 	printk(KERN_INFO "radio-typhoon: port 0x%x.\n", typhoon_unit.iobase);
 	printk(KERN_INFO "radio-typhoon: mute frequency is %lu kHz.\n",
 	       typhoon_unit.mutefreq);