Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[linux-2.6-omap-h63xx.git] / drivers / ata / sata_via.c

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index a72a2389a11c0c88dd62f6437984d012883b1b52..1c7f19aecc25f25973e2235ffd78b121026af304 100644 (file)
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -77,9 +77,9 @@ static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void vt6420_error_handler(struct ata_port *ap);
 
 static const struct pci_device_id svia_pci_tbl[] = {
-       { 0x1106, 0x0591, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
-       { 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
-       { 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },
+       { PCI_VDEVICE(VIA, 0x0591), vt6420 },
+       { PCI_VDEVICE(VIA, 0x3149), vt6420 },
+       { PCI_VDEVICE(VIA, 0x3249), vt6421 },
 
        { }     /* terminate list */
 };
@@ -230,7 +230,7 @@ static int vt6420_prereset(struct ata_port *ap)
        int online;
 
        /* don't do any SCR stuff if we're not loading */
-       if (!ATA_PFLAG_LOADING)
+       if (!(ap->pflags & ATA_PFLAG_LOADING))
                goto skip_scr;
 
        /* Resume phy.  This is the old resume sequence from