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_via.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_via.c')
-rw-r--r-- | drivers/ata/sata_via.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 7f087aef99de..a72a2389a11c 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
@@ -318,9 +318,10 @@ static void vt6421_init_addrs(struct ata_probe_ent *probe_ent, | |||
318 | static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev) | 318 | static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev) |
319 | { | 319 | { |
320 | struct ata_probe_ent *probe_ent; | 320 | struct ata_probe_ent *probe_ent; |
321 | struct ata_port_info *ppi = &vt6420_port_info; | 321 | struct ata_port_info *ppi[2]; |
322 | 322 | ||
323 | probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); | 323 | ppi[0] = ppi[1] = &vt6420_port_info; |
324 | probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); | ||
324 | if (!probe_ent) | 325 | if (!probe_ent) |
325 | return NULL; | 326 | return NULL; |
326 | 327 | ||