From 80cc4d2b48ed109df721ce6d62f81608cf4a65b4 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Fri, 8 Dec 2006 02:38:53 -0800 Subject: [PATCH] --- yaml --- r: 43697 b: refs/heads/master c: 78028da91e05146c9ce0c9db2fea53e0cded1e81 h: refs/heads/master i: 43695: 06549aa0e464738e3c56eff13c1d1f6ca764ce96 v: v3 --- [refs] | 2 +- trunk/drivers/char/isicom.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4556bd3d2ef5..ac79bcacdc6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 938a7023bbbc626b0ab7ece13fe8cb26cfcc486b +refs/heads/master: 78028da91e05146c9ce0c9db2fea53e0cded1e81 diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c index 604882dac2d2..91b978445229 100644 --- a/trunk/drivers/char/isicom.c +++ b/trunk/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)