diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 4851988..930fe22 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -7134,7 +7134,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) ehi->probe_mask = (1 << ata_link_max_devices(&ap->link)) - 1; ehi->action |= ATA_EH_SOFTRESET; - ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; + ehi->flags |= ATA_EHI_NO_AUTOPSY/* | ATA_EHI_QUIET*/; ap->pflags &= ~ATA_PFLAG_INITIALIZING; ap->pflags |= ATA_PFLAG_LOADING; diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index a583032..bbf9273 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2190,6 +2190,8 @@ int ata_eh_reset(struct ata_link *link, int classify, } } + ehc->i.action |= ATA_EH_HARDRESET; + /* prereset() might have modified ehc->i.action */ if (ehc->i.action & ATA_EH_HARDRESET) reset = hardreset; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index e887aa4..a43be09 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1855,6 +1855,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715S, quirk_msi_intx_disable_bug); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x044d, + quirk_msi_intx_disable_bug); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4390, quirk_msi_intx_disable_ati_bug);