summaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_via.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-26 03:56:33 +0200
committerJeff Garzik <jeff@garzik.org>2006-09-26 03:56:33 +0200
commit29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c (patch)
tree3c99d228ea364fb9c85f50227a49aa8264589ede /drivers/ata/sata_via.c
parent[PATCH] ata-piix: fixes kerneldoc error (diff)
downloadlinux-29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c.tar.xz
linux-29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c.zip
[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.c7
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,
static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev)
{
struct ata_probe_ent *probe_ent;
- struct ata_port_info *ppi = &vt6420_port_info;
-
- probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
+ struct ata_port_info *ppi[2];
+
+ ppi[0] = ppi[1] = &vt6420_port_info;
+ probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
if (!probe_ent)
return NULL;