Skip to content

Commit

Permalink
[PATCH] Char: isicom, use pci_request_region
Browse files Browse the repository at this point in the history
Use pci_request_region in pci probing function instead of request_region.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent 938a702 commit 78028da
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/char/isicom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1789,7 +1789,8 @@ static int __devinit isicom_probe(struct pci_dev *pdev,

pci_set_drvdata(pdev, board);

if (!request_region(board->base, 16, ISICOM_NAME)) {
retval = pci_request_region(pdev, 3, ISICOM_NAME);
if (retval) {
dev_err(&pdev->dev, "I/O Region 0x%lx-0x%lx is busy. Card%d "
"will be disabled.\n", board->base, board->base + 15,
index + 1);
Expand Down Expand Up @@ -1822,7 +1823,7 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
errunri:
free_irq(board->irq, board);
errunrr:
release_region(board->base, 16);
pci_release_region(pdev, 3);
err:
board->base = 0;
return retval;
Expand All @@ -1837,7 +1838,7 @@ static void __devexit isicom_remove(struct pci_dev *pdev)
tty_unregister_device(isicom_normal, board->index * 16 + i);

free_irq(board->irq, board);
release_region(board->base, 16);
pci_release_region(pdev, 3);
}

static int __init isicom_init(void)
Expand Down

0 comments on commit 78028da

Please sign in to comment.