Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49277b1c authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: stallion, proper fail return values 



do not return 0 in one case and return proper values in other 2.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e415109f

drivers/char/stallion.c

+5 −1
Original line number Diff line number Diff line
@@ -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,9 +2224,11 @@ 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;

	brdp->nrbnks = banknr;
@@ -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;