diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-29 06:49:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-29 06:49:24 -0400 |
| commit | 360737a982b1ae09e1659e0bb27085c03f02f404 (patch) | |
| tree | 73fd061e06ec61fdc4a332793cf9e185ea0c31f3 | |
| parent | 12850ffe71c677b30f62fc054925837f1fdc4266 (diff) | |
| download | linux-3.10-360737a982b1ae09e1659e0bb27085c03f02f404.tar.gz linux-3.10-360737a982b1ae09e1659e0bb27085c03f02f404.tar.bz2 linux-3.10-360737a982b1ae09e1659e0bb27085c03f02f404.zip | |
[libata] sata_nv: fix SWNCQ enabling
Adapted from patches by Kuan Lou @ NVIDIA and Bartlomiej Zolnierkiewicz.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| -rw-r--r-- | drivers/ata/sata_nv.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index fea8d8d448e..35b2df29752 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -2385,6 +2385,14 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) type = ADMA; } + if (type == SWNCQ) { + if (swncq_enabled) + dev_printk(KERN_NOTICE, &pdev->dev, + "Using SWNCQ mode\n"); + else + type = GENERIC; + } + ppi[0] = &nv_port_info[type]; rc = ata_pci_prepare_sff_host(pdev, ppi, &host); if (rc) @@ -2426,10 +2434,8 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rc = nv_adma_host_init(host); if (rc) return rc; - } else if (type == SWNCQ && swncq_enabled) { - dev_printk(KERN_NOTICE, &pdev->dev, "Using SWNCQ mode\n"); + } else if (type == SWNCQ) nv_swncq_host_init(host); - } pci_set_master(pdev); return ata_host_activate(host, pdev->irq, ppi[0]->irq_handler, |