Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6] / drivers / scsi / sata_nv.c

diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 19deaa42fbf0dbf41f96cc3f241dd466894cb4f3..5cc42c6054eb66ebd8dbc67052b3e86ca4f2032a 100644 (file)
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -44,7 +44,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME                       "sata_nv"
-#define DRV_VERSION                    "0.9"
+#define DRV_VERSION                    "2.0"
 
 enum {
        NV_PORTS                        = 2,
@@ -135,6 +135,10 @@ static const struct pci_device_id nv_pci_tbl[] = {
                PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
+       { PCI_VENDOR_ID_NVIDIA, 0x045c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
+       { PCI_VENDOR_ID_NVIDIA, 0x045d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
+       { PCI_VENDOR_ID_NVIDIA, 0x045e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
+       { PCI_VENDOR_ID_NVIDIA, 0x045f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },
        { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
                PCI_ANY_ID, PCI_ANY_ID,
                PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
@@ -371,14 +375,13 @@ static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance,
                                    struct pt_regs *regs)
 {
        struct ata_host_set *host_set = dev_instance;
-       unsigned long flags;
        u8 irq_stat;
        irqreturn_t ret;
 
-       spin_lock_irqsave(&host_set->lock, flags);
+       spin_lock(&host_set->lock);
        irq_stat = inb(host_set->ports[0]->ioaddr.scr_addr + NV_INT_STATUS);
        ret = nv_do_interrupt(host_set, irq_stat);
-       spin_unlock_irqrestore(&host_set->lock, flags);
+       spin_unlock(&host_set->lock);
 
        return ret;
 }
@@ -387,14 +390,13 @@ static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance,
                                      struct pt_regs *regs)
 {
        struct ata_host_set *host_set = dev_instance;
-       unsigned long flags;
        u8 irq_stat;
        irqreturn_t ret;
 
-       spin_lock_irqsave(&host_set->lock, flags);
+       spin_lock(&host_set->lock);
        irq_stat = readb(host_set->mmio_base + NV_INT_STATUS_CK804);
        ret = nv_do_interrupt(host_set, irq_stat);
-       spin_unlock_irqrestore(&host_set->lock, flags);
+       spin_unlock(&host_set->lock);
 
        return ret;
 }