]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sfc: Fix memory BAR release call on error path
authorBen Hutchings <bhutchings@solarflare.com>
Mon, 1 Sep 2008 11:49:15 +0000 (12:49 +0100)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 24 Sep 2008 22:54:35 +0000 (18:54 -0400)
Match pci_request_region() with pci_release_region(), not
release_mem_region().

From: Steve Hodgson <shodgson@solarflare.com>
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/sfc/efx.c

index 0d47d6ffe68a4fc670119c1c0a047fab0f6cafb3..6d3eb823488e64f35336392896378bc8f44d8245 100644 (file)
@@ -780,7 +780,7 @@ static int efx_init_io(struct efx_nic *efx)
        return 0;
 
  fail4:
-       release_mem_region(efx->membase_phys, efx->type->mem_map_size);
+       pci_release_region(efx->pci_dev, efx->type->mem_bar);
  fail3:
        efx->membase_phys = 0;
  fail2: