From 93ff3e7ea0ed4c148f2a54611fc27a26f14b4352 Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Thu, 2 Aug 2007 01:41:14 +1000 Subject: [PATCH] --- yaml --- r: 63659 b: refs/heads/master c: 5628244059976009151d41c2798855290753d8d5 h: refs/heads/master i: 63657: 7ede68e18aca31b0fbecfa628a77c635926587fe 63655: 750c7499fc414ddeaa9779385f484718077d43ab v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/powermac/feature.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5deed8acaa9a..0ae0a974ba52 100644 --- 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 index f29705f8047d..ba931be2175c 100644 --- 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; }