]> git.neil.brown.name Git - history.git/commitdiff
[PATCH] request_region fix in madgemc.c
authorDave Jones <davej@codemonkey.org.uk>
Mon, 25 Nov 2002 10:39:31 +0000 (02:39 -0800)
committerDave Jones <davej@codemonkey.org.uk>
Mon, 25 Nov 2002 10:39:31 +0000 (02:39 -0800)
drivers/net/tokenring/madgemc.c

index 453aaa0f500219dfedcae1bc9e14ea4e0d4b4180..0390d01340cf34b8fa914177a769ded197ee2f63 100644 (file)
@@ -226,16 +226,12 @@ int __init madgemc_probe(void)
                        goto getout;
                }
 
-               request_region(dev->base_addr, MADGEMC_IO_EXTENT, "madgemc");
-#if 0
-               /* why is this not working? */
-               if (request_region(dev->base_addr, MADGEMC_IO_EXTENT, 
+               if (!request_region(dev->base_addr, MADGEMC_IO_EXTENT, 
                                   "madgemc")) {
                        printk(KERN_INFO "madgemc: unable to setup Smart MC in slot %d because of I/O base conflict at 0x%04lx\n", slot, dev->base_addr);
                        dev->base_addr += MADGEMC_SIF_OFFSET;
                        goto getout;
                }
-#endif
                dev->base_addr += MADGEMC_SIF_OFFSET;
                
                /*