diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-25 21:56:33 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-25 21:56:33 -0400 |
commit | 29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c (patch) | |
tree | 3c99d228ea364fb9c85f50227a49aa8264589ede /drivers/ata/sata_nv.c | |
parent | c32a8fd7cb33f30bcd855188dc8e243b144c5cee (diff) |
[libata] Fix oops introduced in non-uniform port handling fix
Noticed by several people.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_nv.c')
-rw-r--r-- | drivers/ata/sata_nv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 27c22feebf30..8cd730fe5dd3 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -484,7 +484,7 @@ static void nv_error_handler(struct ata_port *ap) | |||
484 | static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | 484 | static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) |
485 | { | 485 | { |
486 | static int printed_version = 0; | 486 | static int printed_version = 0; |
487 | struct ata_port_info *ppi; | 487 | struct ata_port_info *ppi[2]; |
488 | struct ata_probe_ent *probe_ent; | 488 | struct ata_probe_ent *probe_ent; |
489 | int pci_dev_busy = 0; | 489 | int pci_dev_busy = 0; |
490 | int rc; | 490 | int rc; |
@@ -520,8 +520,8 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
520 | 520 | ||
521 | rc = -ENOMEM; | 521 | rc = -ENOMEM; |
522 | 522 | ||
523 | ppi = &nv_port_info[ent->driver_data]; | 523 | ppi[0] = ppi[1] = &nv_port_info[ent->driver_data]; |
524 | probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); | 524 | probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); |
525 | if (!probe_ent) | 525 | if (!probe_ent) |
526 | goto err_out_regions; | 526 | goto err_out_regions; |
527 | 527 | ||