From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 1 Sep 2008 11:49:15 +0000 (+0100)
Subject: sfc: Fix memory BAR release call on error path
X-Git-Tag: v2.6.28-rc1~717^2~195^2~54
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e1074a0d966ac372bb0abd5eee926a0b57316582;p=linux-2.6-omap-h63xx.git

sfc: Fix memory BAR release call on error path

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>
---

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 0d47d6ffe68..6d3eb823488 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -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: