summaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_uli.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-25 21:56:33 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-25 21:56:33 -0400
commit29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c (patch)
tree3c99d228ea364fb9c85f50227a49aa8264589ede /drivers/ata/sata_uli.c
parentc32a8fd7cb33f30bcd855188dc8e243b144c5cee (diff)
downloadop-kernel-dev-29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c.zip
op-kernel-dev-29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c.tar.gz
[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_uli.c')
-rw-r--r--drivers/ata/sata_uli.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 8fc6e80..dd76f37 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -185,7 +185,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
{
static int printed_version;
struct ata_probe_ent *probe_ent;
- struct ata_port_info *ppi;
+ struct ata_port_info *ppi[2];
int rc;
unsigned int board_idx = (unsigned int) ent->driver_data;
int pci_dev_busy = 0;
@@ -211,8 +211,8 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
if (rc)
goto err_out_regions;
- ppi = &uli_port_info;
- probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
+ ppi[0] = ppi[1] = &uli_port_info;
+ probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
if (!probe_ent) {
rc = -ENOMEM;
goto err_out_regions;
OpenPOWER on IntegriCloud