VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / sound / oss / msnd_pinnacle.c

diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index a130ba4..eb345b6 100644 (file)
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -1145,11 +1145,10 @@ static int __init probe_multisound(void)
        char *pinfiji = "Pinnacle/Fiji";
 #endif
 
-       if (check_region(dev.io, dev.numio)) {
+       if (!request_region(dev.io, dev.numio, "probing")) {
                printk(KERN_ERR LOGNAME ": I/O port conflict\n");
                return -ENODEV;
        }
-       request_region(dev.io, dev.numio, "probing");
 
        if (reset_dsp() < 0) {
                release_region(dev.io, dev.numio);
@@ -1833,12 +1832,11 @@ static int __init msnd_init(void)
                /* Joystick */
                pinnacle_devs[3].io0 = joystick_io;
 
-               if (check_region(cfg, 2)) {
+               if (!request_region(cfg, 2, "Pinnacle/Fiji Config")) {
                        printk(KERN_ERR LOGNAME ": Config port 0x%x conflict\n", cfg);
                        return -EIO;
                }
 
-               request_region(cfg, 2, "Pinnacle/Fiji Config");
                if (msnd_pinnacle_cfg_devices(cfg, reset, pinnacle_devs)) {
                        printk(KERN_ERR LOGNAME ": Device configuration error\n");
                        release_region(cfg, 2);