Commit 1187ece3 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] mxser: PCI refcounts

Switch to pci ref counts for mxser when handling PCI devices.  Use
pci_get_device and drop the reference when we finish and unload.
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Greg KH <greg@kroah.com>
Cc: <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ae25f8ec
...@@ -515,6 +515,7 @@ static void __exit mxser_module_exit(void) ...@@ -515,6 +515,7 @@ static void __exit mxser_module_exit(void)
if (pdev != NULL) { /* PCI */ if (pdev != NULL) { /* PCI */
release_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2)); release_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2));
release_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3)); release_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3));
pci_dev_put(pdev);
} else { } else {
release_region(mxsercfg[i].ioaddr[0], 8 * mxsercfg[i].ports); release_region(mxsercfg[i].ioaddr[0], 8 * mxsercfg[i].ports);
release_region(mxsercfg[i].vector, 1); release_region(mxsercfg[i].vector, 1);
...@@ -839,9 +840,9 @@ static int mxser_init(void) ...@@ -839,9 +840,9 @@ static int mxser_init(void)
index = 0; index = 0;
b = 0; b = 0;
while (b < n) { while (b < n) {
pdev = pci_find_device(mxser_pcibrds[b].vendor, pdev = pci_get_device(mxser_pcibrds[b].vendor,
mxser_pcibrds[b].device, pdev); mxser_pcibrds[b].device, pdev);
if (pdev == NULL) { if (pdev == NULL) {
b++; b++;
continue; continue;
} }
...@@ -893,6 +894,9 @@ static int mxser_init(void) ...@@ -893,6 +894,9 @@ static int mxser_init(void)
if (mxser_initbrd(m, &hwconf) < 0) if (mxser_initbrd(m, &hwconf) < 0)
continue; continue;
m++; m++;
/* Keep an extra reference if we succeeded. It will
be returned at unload time */
pci_dev_get(pdev);
} }
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment