From fc2b5df3117f31772f4ac349aa791e55d7f89fa0 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Fri, 8 Dec 2006 02:38:16 -0800 Subject: [PATCH] --- yaml --- r: 43654 b: refs/heads/master c: 596280156afa99cb02f2193e0e06e6e4f2434f30 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/mxser_new.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f037d6a76450..1291a9044354 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 943f295903e152f940ba4260d1e790a05d2f64a3 +refs/heads/master: 596280156afa99cb02f2193e0e06e6e4f2434f30 diff --git a/trunk/drivers/char/mxser_new.c b/trunk/drivers/char/mxser_new.c index 863c1b27849b..4db43f31b693 100644 --- a/trunk/drivers/char/mxser_new.c +++ b/trunk/drivers/char/mxser_new.c @@ -526,8 +526,8 @@ static void __exit mxser_module_exit(void) pdev = mxser_boards[i].pdev; free_irq(mxser_boards[i].irq, &mxser_boards[i]); if (pdev != NULL) { /* PCI */ - release_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2)); - release_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3)); + pci_release_region(pdev, 2); + pci_release_region(pdev, 3); pci_dev_put(pdev); } else { release_region(mxser_boards[i].ports[0].ioaddr, 8 * mxser_boards[i].nports); @@ -627,16 +627,14 @@ static int __init mxser_get_PCI_conf(int board_type, struct mxser_board *brd, brd->board_type = board_type; brd->nports = mxser_numports[board_type - 1]; ioaddress = pci_resource_start(pdev, 2); - request_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2), - "mxser(IO)"); + pci_request_region(pdev, 2, "mxser(IO)"); for (i = 0; i < brd->nports; i++) brd->ports[i].ioaddr = ioaddress + 8 * i; /* vector */ ioaddress = pci_resource_start(pdev, 3); - request_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3), - "mxser(vector)"); + pci_request_region(pdev, 3, "mxser(vector)"); brd->vector = ioaddress; /* irq */