]> git.hungrycats.org Git - linux/commitdiff
[PATCH] check_region elimination
authorRusty Russell <rusty@rustcorp.com.au>
Wed, 22 May 2002 05:25:06 +0000 (22:25 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 22 May 2002 05:25:06 +0000 (22:25 -0700)
Trivial patch update against 2.5.17:
johnpol@2ka.mipt.ru: 23) request_region check, 21-30:
  here is one more trivial check.

  So please test and apply.

   Evgeniy Polyakov ( s0mbre )

drivers/block/xd.c

index 0e439263aab347e71808a3bf737619cf4b5f9b8d..df12c3b6ca8eb786b352eeead9601f864f01cad7 100644 (file)
@@ -210,12 +210,11 @@ static void __init xd_geninit (void)
 
                printk("Detected a%s controller (type %d) at address %06x\n",
                        xd_sigs[controller].name,controller,address);
-               if (check_region(xd_iobase,4)) {
+               if (!request_region(xd_iobase,4,"xd")) {
                        printk("xd: Ports at 0x%x are not available\n",
                                xd_iobase);
                        return;
                }
-               request_region(xd_iobase,4,"xd");
                if (controller)
                        xd_sigs[controller].init_controller(address);
                xd_drives = xd_initdrives(xd_sigs[controller].init_drive);