]> err.no Git - linux-2.6/commitdiff
[POWERPC] via-pmu: Switch to ref counting PCI API
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Mon, 23 Apr 2007 13:56:01 +0000 (14:56 +0100)
committerPaul Mackerras <paulus@samba.org>
Tue, 24 Apr 2007 12:13:18 +0000 (22:13 +1000)
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
drivers/macintosh/via-pmu.c

index e31cb1e7a47b70d124e9b59d8cfffa7471a916a0..1729d3fd7a11417ed63c784986290b9bba5b1a4c 100644 (file)
@@ -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();