Skip to content

Commit

Permalink
jsm: Fix the return variable and removing the unused retval.
Browse files Browse the repository at this point in the history
As it was, the retval was never returned, so its assignments were silly.
Just consolidate everything to rc, and remove the unused retval variable.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@etchedpixels.co.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Breno Leitao authored and Linus Torvalds committed Apr 6, 2009
1 parent aacf17a commit e713abe
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/serial/jsm/jsm_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
int rc = 0;
struct jsm_board *brd;
static int adapter_count = 0;
int retval;

rc = pci_enable_device(pdev);
if (rc) {
Expand Down Expand Up @@ -134,15 +133,15 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
rc = jsm_tty_init(brd);
if (rc < 0) {
dev_err(&pdev->dev, "Can't init tty devices (%d)\n", rc);
retval = -ENXIO;
rc = -ENXIO;
goto out_free_irq;
}

rc = jsm_uart_port_init(brd);
if (rc < 0) {
/* XXX: leaking all resources from jsm_tty_init here! */
dev_err(&pdev->dev, "Can't init uart port (%d)\n", rc);
retval = -ENXIO;
rc = -ENXIO;
goto out_free_irq;
}

Expand All @@ -161,7 +160,7 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
/* XXX: leaking all resources from jsm_tty_init and
jsm_uart_port_init here! */
dev_err(&pdev->dev, "memory allocation for flipbuf failed\n");
retval = -ENOMEM;
rc = -ENOMEM;
goto out_free_irq;
}

Expand Down

0 comments on commit e713abe

Please sign in to comment.