---

yaml
---
r: 57471
b: refs/heads/master
c: 49277b1
h: refs/heads/master
i:
  57469: acdbebb
  57467: 40e26dc
  57463: ae8be28
  57455: 8610284
  57439: af9b0bd
  57407: 6b51bf8
  57343: f802f7a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e415109f5a1ec9ca7dac4fad2b852113ce303c96
+refs/heads/master: 49277b1c68f9bd22119a5174a68254ec1b39d8c2

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;