Skip to content

Commit

Permalink
tty: isicom, enable/disable pci device
Browse files Browse the repository at this point in the history
Don't forget to enable and disable PCI devices.  The device might be
unusable without that.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Jul 21, 2008
1 parent 9afd561 commit e1e5770
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions 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 e1e5770

Please sign in to comment.