aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2007-04-23 09:56:01 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-24 08:13:18 -0400
commitc78f830547087aa4143affd3404a854995603544 (patch)
treea8ac48399057405a3cf67b7273906b073d61de93
parentab4627683a0e4430cb5acb1cd896f08ec5dad90c (diff)
[POWERPC] via-pmu: Switch to ref counting PCI API
Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--drivers/macintosh/via-pmu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index e31cb1e7a47b..1729d3fd7a11 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2135,7 +2135,7 @@ static int powerbook_sleep_grackle(void)
2135 int ret; 2135 int ret;
2136 struct pci_dev *grackle; 2136 struct pci_dev *grackle;
2137 2137
2138 grackle = pci_find_slot(0, 0); 2138 grackle = pci_get_bus_and_slot(0, 0);
2139 if (!grackle) 2139 if (!grackle)
2140 return -ENODEV; 2140 return -ENODEV;
2141 2141
@@ -2183,6 +2183,8 @@ static int powerbook_sleep_grackle(void)
2183 pmcr1 &= ~(GRACKLE_PM|GRACKLE_DOZE|GRACKLE_SLEEP|GRACKLE_NAP); 2183 pmcr1 &= ~(GRACKLE_PM|GRACKLE_DOZE|GRACKLE_SLEEP|GRACKLE_NAP);
2184 pci_write_config_word(grackle, 0x70, pmcr1); 2184 pci_write_config_word(grackle, 0x70, pmcr1);
2185 2185
2186 pci_dev_put(grackle);
2187
2186 /* Make sure the PMU is idle */ 2188 /* Make sure the PMU is idle */
2187 pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,0); 2189 pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,0);
2188 restore_via_state(); 2190 restore_via_state();