Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43647
b: refs/heads/master
c: 1187ece
h: refs/heads/master
i:
  43645: 67bfb2f
  43643: 74e82c1
  43639: 976c965
  43631: a8cb7f5
  43615: 4ea764a
  43583: 0075d49
  43519: 8519d90
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Dec 8, 2006
1 parent cbaca41 commit f6df9bc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 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: ae25f8ecdf65cd3e79e077dc0dba46416134d00c
refs/heads/master: 1187ece3db310cb1e7cd75083dc7253dbac39675
8 changes: 6 additions & 2 deletions trunk/drivers/char/mxser.c
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ static void __exit mxser_module_exit(void)
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_dev_put(pdev);
} else {
release_region(mxsercfg[i].ioaddr[0], 8 * mxsercfg[i].ports);
release_region(mxsercfg[i].vector, 1);
Expand Down Expand Up @@ -839,9 +840,9 @@ static int mxser_init(void)
index = 0;
b = 0;
while (b < n) {
pdev = pci_find_device(mxser_pcibrds[b].vendor,
pdev = pci_get_device(mxser_pcibrds[b].vendor,
mxser_pcibrds[b].device, pdev);
if (pdev == NULL) {
if (pdev == NULL) {
b++;
continue;
}
Expand Down Expand Up @@ -893,6 +894,9 @@ static int mxser_init(void)
if (mxser_initbrd(m, &hwconf) < 0)
continue;
m++;
/* Keep an extra reference if we succeeded. It will
be returned at unload time */
pci_dev_get(pdev);
}
}
#endif
Expand Down

0 comments on commit f6df9bc

Please sign in to comment.