diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /drivers/media/radio/radio-rtrack2.c | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'drivers/media/radio/radio-rtrack2.c')
| -rw-r--r-- | drivers/media/radio/radio-rtrack2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c index ad479af32..d34315b2b 100644 --- a/drivers/media/radio/radio-rtrack2.c +++ b/drivers/media/radio/radio-rtrack2.c @@ -230,7 +230,7 @@ static int __init rtrack2_init(void) printk(KERN_ERR "You must set an I/O address with io=0x20c or io=0x30c\n"); return -EINVAL; } - if (check_region(io, 4)) + if (request_region(io, 4, "rtrack2")) { printk(KERN_ERR "rtrack2: port 0x%x already in use\n", io); return -EBUSY; @@ -240,9 +240,11 @@ static int __init rtrack2_init(void) spin_lock_init(&lock); if(video_register_device(&rtrack2_radio, VFL_TYPE_RADIO)==-1) + { + release_region(io, 4); return -EINVAL; + } - request_region(io, 4, "rtrack2"); printk(KERN_INFO "AIMSlab Radiotrack II card driver.\n"); /* mute card - prevents noisy bootups */ |