Skip to content

Commit

Permalink
pata_via: fix double put on isa bridge
Browse files Browse the repository at this point in the history
In via_init_one, when via_isa_bridges iterator reaches
PCI_DEVICE_ID_VIA_ANON and last but one via_isa_bridges bridge is
found but rev doesn't match, pci_dev_put(isa) is called twice.

Do pci_dev_put only once.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Jiri Slaby authored and Jeff Garzik committed Dec 3, 2009
1 parent ba3a221 commit 7095e3e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/ata/pata_via.c
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
.port_ops = &via_port_ops
};
const struct ata_port_info *ppi[] = { NULL, NULL };
struct pci_dev *isa = NULL;
struct pci_dev *isa;
const struct via_isa_bridge *config;
static int printed_version;
u8 enable;
Expand All @@ -551,15 +551,13 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
if ((isa = pci_get_device(PCI_VENDOR_ID_VIA +
!!(config->flags & VIA_BAD_ID),
config->id, NULL))) {
u8 rev = isa->revision;
pci_dev_put(isa);

if (isa->revision >= config->rev_min &&
isa->revision <= config->rev_max)
if (rev >= config->rev_min && rev <= config->rev_max)
break;
pci_dev_put(isa);
}

pci_dev_put(isa);

if (!(config->flags & VIA_NO_ENABLES)) {
/* 0x40 low bits indicate enabled channels */
pci_read_config_byte(pdev, 0x40 , &enable);
Expand Down

0 comments on commit 7095e3e

Please sign in to comment.