[PATCH] stallion multiport driver missing request_region()

[Badari Pulavarty <pbadari@xxxxxxxxxx>]

stl_initeio() doesn't release the regions in failure cases.

Signed-off-by: Badari Pulavarty <pbadari@xxxxxxxxxx>

 drivers/char/stallion.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

Index: linux-2.6.18/drivers/char/stallion.c
===================================================================
--- linux-2.6.18.orig/drivers/char/stallion.c	2006-09-19 20:42:06.000000000 -0700
+++ linux-2.6.18/drivers/char/stallion.c	2006-09-28 11:51:35.000000000 -0700
@@ -2265,10 +2265,16 @@ static inline int stl_initeio(stlbrd_t *
 			brdp->nrports = 16;
 			break;
 		default:
+			release_region(brdp->ioaddr1, brdp->iosize1);
+			if (brdp->iosize2 > 0)
+				release_region(brdp->ioaddr2, brdp->iosize2);
 			return(-ENODEV);
 		}
 		break;
 	default:
+		release_region(brdp->ioaddr1, brdp->iosize1);
+		if (brdp->iosize2 > 0)
+			release_region(brdp->ioaddr2, brdp->iosize2);
 		return(-ENODEV);
 	}
 
@@ -2281,6 +2287,9 @@ static inline int stl_initeio(stlbrd_t *
 	if (!panelp) {
 		printk(KERN_WARNING "STALLION: failed to allocate memory "
 			"(size=%Zd)\n", sizeof(stlpanel_t));
+		release_region(brdp->ioaddr1, brdp->iosize1);
+		if (brdp->iosize2 > 0)
+			release_region(brdp->ioaddr2, brdp->iosize2);
 		return -ENOMEM;
 	}
 
@@ -2305,6 +2314,9 @@ static inline int stl_initeio(stlbrd_t *
 	if (request_irq(brdp->irq, stl_intr, IRQF_SHARED, name, brdp) != 0) {
 		printk("STALLION: failed to register interrupt "
 		    "routine for %s irq=%d\n", name, brdp->irq);
+		release_region(brdp->ioaddr1, brdp->iosize1);
+		if (brdp->iosize2 > 0)
+			release_region(brdp->ioaddr2, brdp->iosize2);
 		rc = -ENODEV;
 	} else {
 		rc = 0;


-
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html