Skip to content

Commit

Permalink
Char: stallion, proper fail return values
Browse files Browse the repository at this point in the history
do not return 0 in one case and return proper values in other 2.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Jun 9, 2007
1 parent e415109 commit 49277b1
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/char/stallion.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 49277b1

Please sign in to comment.