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_uli.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_uli.c')
-rw-r--r-- | drivers/ata/sata_uli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index 8fc6e800011a..dd76f37be182 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) | |||
185 | { | 185 | { |
186 | static int printed_version; | 186 | static int printed_version; |
187 | struct ata_probe_ent *probe_ent; | 187 | struct ata_probe_ent *probe_ent; |
188 | struct ata_port_info *ppi; | 188 | struct ata_port_info *ppi[2]; |
189 | int rc; | 189 | int rc; |
190 | unsigned int board_idx = (unsigned int) ent->driver_data; | 190 | unsigned int board_idx = (unsigned int) ent->driver_data; |
191 | int pci_dev_busy = 0; | 191 | int pci_dev_busy = 0; |
@@ -211,8 +211,8 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
211 | if (rc) | 211 | if (rc) |
212 | goto err_out_regions; | 212 | goto err_out_regions; |
213 | 213 | ||
214 | ppi = &uli_port_info; | 214 | ppi[0] = ppi[1] = &uli_port_info; |
215 | probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); | 215 | probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); |
216 | if (!probe_ent) { | 216 | if (!probe_ent) { |
217 | rc = -ENOMEM; | 217 | rc = -ENOMEM; |
218 | goto err_out_regions; | 218 | goto err_out_regions; |