diff options
| author | Jiri Slaby | 2006-12-08 02:38:53 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2006-12-08 08:28:57 -0800 |
| commit | 78028da91e05146c9ce0c9db2fea53e0cded1e81 (patch) | |
| tree | bd5f6e54b722538729d760960273d1affd76fd43 | |
| parent | 938a7023bbbc626b0ab7ece13fe8cb26cfcc486b (diff) | |
[PATCH] Char: isicom, use pci_request_region
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>
| -rw-r--r-- | drivers/char/isicom.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 604882dac2d2..91b978445229 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -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); @@ -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; @@ -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) |