Merge commit 'v2.6.28-rc4' into timers/rtc

[linux-2.6-omap-h63xx.git] / drivers / scsi / aic7xxx / aic7xxx_osm_pci.c

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 0d7628f1f1eff4edd573befaa4037c2111644ac3..00f5b98685749ae567f2e63c444407f6fe644c61 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -352,7 +352,7 @@ ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, resource_size_t *base)
        *base = pci_resource_start(ahc->dev_softc, 0);
        if (*base == 0)
                return (ENOMEM);
-       if (request_region(*base, 256, "aic7xxx") == 0)
+       if (!request_region(*base, 256, "aic7xxx"))
                return (ENOMEM);
        return (0);
 }
@@ -369,7 +369,7 @@ ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
        start = pci_resource_start(ahc->dev_softc, 1);
        if (start != 0) {
                *bus_addr = start;
-               if (request_mem_region(start, 0x1000, "aic7xxx") == 0)
+               if (!request_mem_region(start, 0x1000, "aic7xxx"))
                        error = ENOMEM;
                if (error == 0) {
                        *maddr = ioremap_nocache(start, 256);