diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 16:42:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 16:42:16 -0700 |
| commit | a1480a166dd509f25f90e824411cb488fa9fff7e (patch) | |
| tree | f90633d00164827e002e79b8d26c130c0db25f33 /drivers/ide | |
| parent | 45141eeafefdb8998d2ab1f87c2afe0457059b47 (diff) | |
| parent | c54c719b558e0eb3ba60b1390aeb47ed25ff4352 (diff) | |
| download | linux-stable-a1480a166dd509f25f90e824411cb488fa9fff7e.tar.gz linux-stable-a1480a166dd509f25f90e824411cb488fa9fff7e.tar.bz2 linux-stable-a1480a166dd509f25f90e824411cb488fa9fff7e.zip | |
Merge branch 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata updates from Tejun Heo:
- Hannes's patchset implements support for better error reporting
introduced by the new ATA command spec.
- the deperecated pci_ dma API usages have been replaced by dma_ ones.
- a bunch of hardware specific updates and some cleanups.
* 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ata: remove deprecated use of pci api
ahci: st: st_configure_oob must be called after IP is clocked.
ahci: st: Update the ahci_st DT documentation
ahci: st: Update the DT example for how to obtain the PHY.
sata_dwc_460ex: indent an if statement
libata: Add tracepoints
libata-eh: Set 'information' field for autosense
libata: Implement support for sense data reporting
libata: Implement NCQ autosense
libata: use status bit definitions in ata_dump_status()
ide,ata: Rename ATA_IDX to ATA_SENSE
libata: whitespace fixes in ata_to_sense_error()
libata: whitespace cleanup in ata_get_cmd_descript()
libata: use READ_LOG_DMA_EXT
libata: remove ATA_FLAG_LOWTAG
sata_dwc_460ex: re-use hsdev->dev instead of dwc_dev
sata_dwc_460ex: move to generic DMA driver
sata_dwc_460ex: join messages back
sata: xgene: add ACPI support for APM X-Gene SATA ports
ata: sata_mv: add proper definitions for LP_PHY_CTL register values
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-lib.c | 4 | ||||
| -rw-r--r-- | drivers/ide/ide-probe.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index d9c9829c8b20..e1180fa46196 100644 --- a/drivers/ide/ide-lib.c +++ b/drivers/ide/ide-lib.c @@ -148,8 +148,8 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat) printk(KERN_CONT "DataRequest "); if (stat & ATA_CORR) printk(KERN_CONT "CorrectedError "); - if (stat & ATA_IDX) - printk(KERN_CONT "Index "); + if (stat & ATA_SENSE) + printk(KERN_CONT "Sense "); if (stat & ATA_ERR) printk(KERN_CONT "Error "); } diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index a3d3b1733c49..0b63facd1d87 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -273,7 +273,7 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id, int irq_ctx) (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) { a = tp_ops->read_altstatus(hwif); s = tp_ops->read_status(hwif); - if ((a ^ s) & ~ATA_IDX) + if ((a ^ s) & ~ATA_SENSE) /* ancient Seagate drives, broken interfaces */ printk(KERN_INFO "%s: probing with STATUS(0x%02x) " "instead of ALTSTATUS(0x%02x)\n", |