---

yaml --- r: 63659 b: refs/heads/master c: 5628244 h: refs/heads/master i: 63657: 7ede68e 63655: 750c749 v: v3
git-mirror · Aug 3, 2007 · 93ff3e7 · 93ff3e7
1 parent ec49fe8
commit 93ff3e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a77d291be53fbc619f14a6199b9b4cac036c476
+refs/heads/master: 5628244059976009151d41c2798855290753d8d5
diff --git a/trunk/arch/powerpc/platforms/powermac/feature.c b/trunk/arch/powerpc/platforms/powermac/feature.c
@@ -826,13 +826,15 @@ core99_ata100_enable(struct device_node *node, long value)
 
 	if (value) {
 		if (pci_device_from_OF_node(node, &pbus, &pid) == 0)
-			pdev = pci_find_slot(pbus, pid);
+			pdev = pci_get_bus_and_slot(pbus, pid);
 		if (pdev == NULL)
 			return 0;
 		rc = pci_enable_device(pdev);
+		if (rc == 0)
+			pci_set_master(pdev);
+		pci_dev_put(pdev);
 		if (rc)
 			return rc;
-		pci_set_master(pdev);
 	}
 	return 0;
 }