From f6df9bc307d78ca7504502e0ad8b244458fa15ff Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Fri, 8 Dec 2006 02:38:10 -0800
Subject: [PATCH] --- yaml --- r: 43647 b: refs/heads/master c:
 1187ece3db310cb1e7cd75083dc7253dbac39675 h: refs/heads/master i:   43645:
 67bfb2f27f1c33f12ab2c806000fb8c78875a08c   43643:
 74e82c1ac8339d7a7c50512b289c905808082505   43639:
 976c9657575bc2fd0e24aa22debee524a943c386   43631:
 a8cb7f5136676b19768c8991b83852db190b0495   43615:
 4ea764a1d51a3c555aba99ad06adfe3b330c97f8   43583:
 0075d49d7a7933a14b296914a6f94373ea4615c8   43519:
 8519d9091ae15a5aadd8a62cfdd848f6962044e7 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/mxser.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index da22922523dc..d501b524ea3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae25f8ecdf65cd3e79e077dc0dba46416134d00c
+refs/heads/master: 1187ece3db310cb1e7cd75083dc7253dbac39675
diff --git a/trunk/drivers/char/mxser.c b/trunk/drivers/char/mxser.c
index 4204746f1590..2dc49be144e6 100644
--- a/trunk/drivers/char/mxser.c
+++ b/trunk/drivers/char/mxser.c
@@ -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);
@@ -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;
 		}
@@ -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