From e52d192fd95f1602bf5b6b5d72b516f65a15f6a4 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 8 Jun 2007 13:46:53 -0700
Subject: [PATCH] --- yaml --- r: 57471 b: refs/heads/master c:
 49277b1c68f9bd22119a5174a68254ec1b39d8c2 h: refs/heads/master i:   57469:
 acdbebb3c5a83b8152de52ca1c80ae70ab76d2b9   57467:
 40e26dc60728ed1a0115c44604672d513c4f992c   57463:
 ae8be281b3e38bb47847ec5dd89b8ee07b407cb8   57455:
 86102841a49d6ec52fe99ef163a656079a4c3a5b   57439:
 af9b0bdef9468e3edfbf46ba0a1ba1fb6badb615   57407:
 6b51bf8369e55a90ae9df17bfd957c2ea750d557   57343:
 f802f7a104b9d0892ea2759fee445440f015ed2e v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/stallion.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95b0a95cd1f1..2ff3ea1a7090 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e415109f5a1ec9ca7dac4fad2b852113ce303c96
+refs/heads/master: 49277b1c68f9bd22119a5174a68254ec1b39d8c2
diff --git a/trunk/drivers/char/stallion.c b/trunk/drivers/char/stallion.c
index 23ea4c881f58..45bf2a262a85 100644
--- a/trunk/drivers/char/stallion.c
+++ b/trunk/drivers/char/stallion.c
@@ -2177,6 +2177,7 @@ static int __devinit stl_initech(struct stlbrd *brdp)
 		if (!panelp) {
 			printk("STALLION: failed to allocate memory "
 				"(size=%Zd)\n", sizeof(struct stlpanel));
+			retval = -ENOMEM;
 			goto err_fr;
 		}
 		panelp->magic = STL_PANELMAGIC;
@@ -2223,8 +2224,10 @@ static int __devinit stl_initech(struct stlbrd *brdp)
 		brdp->nrports += panelp->nrports;
 		brdp->panels[panelnr++] = panelp;
 		if ((brdp->brdtype != BRD_ECHPCI) &&
-		    (ioaddr >= (brdp->ioaddr2 + brdp->iosize2)))
+		    (ioaddr >= (brdp->ioaddr2 + brdp->iosize2))) {
+			retval = -EINVAL;
 			goto err_fr;
+		}
 	}
 
 	brdp->nrpanels = panelnr;
@@ -2371,6 +2374,7 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev,
 		dev_err(&pdev->dev, "too many boards found, "
 			"maximum supported %d\n", STL_MAXBRDS);
 		mutex_unlock(&stl_brdslock);
+		retval = -ENODEV;
 		goto err_fr;
 	}
 	brdp->brdnr = (unsigned int)brdnr;