diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 07:57:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 07:57:31 -0500 |
| commit | fbf30fbaa61595e9026f628f3913888b0df2b288 (patch) | |
| tree | 9287895eebc60ec0c02b002a089c125e8741f6fb | |
| parent | 6248e64721a4f3db9fbedd207206f47835acce44 (diff) | |
| download | blackbird-op-linux-fbf30fbaa61595e9026f628f3913888b0df2b288.tar.gz blackbird-op-linux-fbf30fbaa61595e9026f628f3913888b0df2b288.zip | |
[libata ata_piix] fix native mode probe, after recent updates
| -rw-r--r-- | drivers/scsi/ata_piix.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c index b7fbf11f3fae..7f8aa1b552ce 100644 --- a/drivers/scsi/ata_piix.c +++ b/drivers/scsi/ata_piix.c @@ -622,7 +622,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) { static int printed_version; struct ata_port_info *port_info[2]; - unsigned int combined = 0, n_ports = 1; + unsigned int combined = 0; unsigned int pata_chan = 0, sata_chan = 0; if (!printed_version++) @@ -634,7 +634,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) return -ENODEV; port_info[0] = &piix_port_info[ent->driver_data]; - port_info[1] = NULL; + port_info[1] = &piix_port_info[ent->driver_data]; if (port_info[0]->host_flags & PIIX_FLAG_AHCI) { u8 tmp; @@ -672,14 +672,13 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) port_info[sata_chan] = &piix_port_info[ent->driver_data]; port_info[sata_chan]->host_flags |= ATA_FLAG_SLAVE_POSS; port_info[pata_chan] = &piix_port_info[ich5_pata]; - n_ports++; dev_printk(KERN_WARNING, &pdev->dev, "combined mode detected (p=%u, s=%u)\n", pata_chan, sata_chan); } - return ata_pci_init_one(pdev, port_info, n_ports); + return ata_pci_init_one(pdev, port_info, 2); } static int __init piix_init(void) |
