[PATCH] ioremap balanced with iounmap for drivers/char/istallion.c

Amol Lad · Linus Torvalds · commit aa8a8d664828 · 2006-12-07T08:39:30.000-08:00
Signed-off-by: Amol Lad &lt;amol@verismonetworks.com&gt;
Acked-by: Alan Cox &lt;alan@redhat.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
@@ -3476,6 +3476,8 @@ static int stli_initecp(stlibrd_t *brdp)
 	if (sig.magic != cpu_to_le32(ECP_MAGIC))
 	{
 		release_region(brdp->iobase, brdp->iosize);
+		iounmap(brdp->membase);
+		brdp->membase = NULL;
 		return -ENODEV;
 	}
 
@@ -3632,6 +3634,8 @@ static int stli_initonb(stlibrd_t *brdp)
 	    sig.magic3 != cpu_to_le16(ONB_MAGIC3))
 	{
 		release_region(brdp->iobase, brdp->iosize);
+		iounmap(brdp->membase);
+		brdp->membase = NULL;
 		return -ENODEV;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3476,6 +3476,8 @@ static int stli_initecp(stlibrd_t *brdp)`
`3476`	`3476`	`if (sig.magic != cpu_to_le32(ECP_MAGIC))`
`3477`	`3477`	`{`
`3478`	`3478`	`release_region(brdp->iobase, brdp->iosize);`
	`3479`	`+ iounmap(brdp->membase);`
	`3480`	`+ brdp->membase = NULL;`
`3479`	`3481`	`return -ENODEV;`
`3480`	`3482`	`}`
`3481`	`3483`
`@@ -3632,6 +3634,8 @@ static int stli_initonb(stlibrd_t *brdp)`
`3632`	`3634`	`sig.magic3 != cpu_to_le16(ONB_MAGIC3))`
`3633`	`3635`	`{`
`3634`	`3636`	`release_region(brdp->iobase, brdp->iosize);`
	`3637`	`+ iounmap(brdp->membase);`
	`3638`	`+ brdp->membase = NULL;`
`3635`	`3639`	`return -ENODEV;`
`3636`	`3640`	`}`
`3637`	`3641`