From 1f9e2b45a8ac32706fa08f430a73199a20f00309 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Mon, 20 Oct 2008 19:13:08 -0600
Subject: [PATCH] --- yaml --- r: 117205 b: refs/heads/master c:
 c4ed02fae78bf6cea0b22edd34a67df972f29832 h: refs/heads/master i:   117203:
 daef066b0817081d4b33bf20e637b76d2f8dae87 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pci/search.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index fea06e493e68..e8d0235d53ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d389fec6a2aec1ea7d47833f36a0413a619c8c12
+refs/heads/master: c4ed02fae78bf6cea0b22edd34a67df972f29832
diff --git a/trunk/drivers/pci/search.c b/trunk/drivers/pci/search.c
index 4edfc4731bd4..5af8bd538149 100644
--- a/trunk/drivers/pci/search.c
+++ b/trunk/drivers/pci/search.c
@@ -166,6 +166,7 @@ struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,
 {
 	struct pci_dev *pdev;
 
+	pci_dev_get(from);
 	pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from);
 	pci_dev_put(pdev);
 	return pdev;
@@ -270,12 +271,8 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
 	struct pci_dev *pdev = NULL;
 
 	WARN_ON(in_interrupt());
-	if (from) {
-		/* FIXME
-		 * take the cast off, when bus_find_device is made const.
-		 */
-		dev_start = (struct device *)&from->dev;
-	}
+	if (from)
+		dev_start = &from->dev;
 	dev = bus_find_device(&pci_bus_type, dev_start, (void *)id,
 			      match_pci_dev_by_id);
 	if (dev)