[PATCH] iounmap after ioremap in error path: arch/ia64/pci/pci.c

[PATCH] iounmap after ioremap in error path: arch/ia64/pci/pci.c

[Roel Kluin]

Do iounmap when too many IO port spaces were encountered

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
---
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 488e48a..13a05d7 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -154,6 +154,7 @@ new_space (u64 phys_base, int sparse)
 			return i;
 
 	if (num_io_spaces = MAX_IO_SPACES) {
+		iounmap(mmio_base);
 		printk(KERN_ERR "PCI: Too many IO port spaces "
 			"(MAX_IO_SPACES=%lu)\n", MAX_IO_SPACES);
 		return ~0;

Re: [PATCH] iounmap after ioremap in error path: arch/ia64/pci/pci.c

[Simon Horman]

On Sun, Nov 04, 2007 at 12:36:50AM +0100, Roel Kluin wrote:
> Do iounmap when too many IO port spaces were encountered
> 
> Signed-off-by: Roel Kluin <12o3l@tiscali.nl>

This looks correct to me, so long as calling iounmap() actually
reverses ioremap() in this case.

> ---
> diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
> index 488e48a..13a05d7 100644
> --- a/arch/ia64/pci/pci.c
> +++ b/arch/ia64/pci/pci.c
> @@ -154,6 +154,7 @@ new_space (u64 phys_base, int sparse)
>  			return i;
>  
>  	if (num_io_spaces = MAX_IO_SPACES) {
> +		iounmap(mmio_base);
>  		printk(KERN_ERR "PCI: Too many IO port spaces "
>  			"(MAX_IO_SPACES=%lu)\n", MAX_IO_SPACES);
>  		return ~0;
> -
> To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/