]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
pata_ali: misplaced pci_dev_put()
authorBen Dooks <ben-linux@fluff.org>
Thu, 24 Jul 2008 15:38:06 +0000 (16:38 +0100)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 31 Jul 2008 05:38:19 +0000 (01:38 -0400)
The ali_init_one() function does a search for an isa_bridge,
but then fails to release it if the revision information was
not correctly found.

the problem comes from:
isa_bridge = pci_get_device(...);
if (isa_bridge && ...) {
pci_dev_put(isa_bridge);
}

where the pci_dev_put() is never called if isa_bridge
was valid but the extra checks on the chip-revision
fail to match.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/ata/pata_ali.c

index 0f3e659db99a029a4392f843a2cca441bcac553c..5ca70fa1f587e2d7953655311f5417313185882b 100644 (file)
@@ -550,8 +550,9 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                pci_read_config_byte(isa_bridge, 0x5E, &tmp);
                if ((tmp & 0x1E) == 0x12)
                        ppi[0] = &info_20_udma;
-               pci_dev_put(isa_bridge);
        }
+       pci_dev_put(isa_bridge);
+
        return ata_pci_sff_init_one(pdev, ppi, &ali_sht, NULL);
 }