Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43654
b: refs/heads/master
c: 5962801
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent 687ab37 commit fc2b5df
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 943f295903e152f940ba4260d1e790a05d2f64a3
refs/heads/master: 596280156afa99cb02f2193e0e06e6e4f2434f30
10 changes: 4 additions & 6 deletions trunk/drivers/char/mxser_new.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit fc2b5df

Please sign in to comment.