summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2007-04-23 14:56:01 +0100
committerPaul Mackerras <paulus@samba.org>2007-04-24 22:13:18 +1000
commitc78f830547087aa4143affd3404a854995603544 (patch)
treea8ac48399057405a3cf67b7273906b073d61de93 /drivers/macintosh
parentab4627683a0e4430cb5acb1cd896f08ec5dad90c (diff)
downloadop-kernel-dev-c78f830547087aa4143affd3404a854995603544.zip
op-kernel-dev-c78f830547087aa4143affd3404a854995603544.tar.gz
[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>
Diffstat (limited to 'drivers/macintosh')
-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 e31cb1e..1729d3f 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2135,7 +2135,7 @@ static int powerbook_sleep_grackle(void)
int ret;
struct pci_dev *grackle;
- grackle = pci_find_slot(0, 0);
+ grackle = pci_get_bus_and_slot(0, 0);
if (!grackle)
return -ENODEV;
@@ -2183,6 +2183,8 @@ static int powerbook_sleep_grackle(void)
pmcr1 &= ~(GRACKLE_PM|GRACKLE_DOZE|GRACKLE_SLEEP|GRACKLE_NAP);
pci_write_config_word(grackle, 0x70, pmcr1);
+ pci_dev_put(grackle);
+
/* Make sure the PMU is idle */
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,0);
restore_via_state();
OpenPOWER on IntegriCloud