Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102349
b: refs/heads/master
c: e1e5770
h: refs/heads/master
i:
  102347: c00192b
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Jul 21, 2008
1 parent 937a2eb commit cf056c5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9afd561acabe5059ff16d163a176e2350269aba5
refs/heads/master: e1e5770bb63fb9d71619a68f52cb0ba4b2ae58a6
8 changes: 8 additions & 0 deletions trunk/drivers/char/isicom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1736,6 +1736,12 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
if (card_count >= BOARD_COUNT)
goto err;

retval = pci_enable_device(pdev);
if (retval) {
dev_err(&pdev->dev, "failed to enable\n");
goto err;
}

dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);

/* allot the first empty slot in the array */
Expand Down Expand Up @@ -1790,6 +1796,7 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
errdec:
board->base = 0;
card_count--;
pci_disable_device(pdev);
err:
return retval;
}
Expand All @@ -1806,6 +1813,7 @@ static void __devexit isicom_remove(struct pci_dev *pdev)
pci_release_region(pdev, 3);
board->base = 0;
card_count--;
pci_disable_device(pdev);
}

static int __init isicom_init(void)
Expand Down

0 comments on commit cf056c5

Please sign in to comment.