Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 142281
b: refs/heads/master
c: e713abe
h: refs/heads/master
i:
  142279: 918bdd8
v: v3
  • Loading branch information
Breno Leitao authored and Linus Torvalds committed Apr 6, 2009
1 parent 97985ca commit 367c0e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aacf17adc62650fa0eb59559b737f543d003575e
refs/heads/master: e713abead3324f6d4381a3d280b7ce35b7eadb7a
7 changes: 3 additions & 4 deletions trunk/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 367c0e3

Please sign in to comment.