|
@@ -2083,7 +2083,7 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
|
|
retry:
|
|
retry:
|
|
ata_tf_init(dev, &tf);
|
|
ata_tf_init(dev, &tf);
|
|
if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id) &&
|
|
if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id) &&
|
|
- !(dev->horkage & ATA_HORKAGE_NO_NCQ_LOG)) {
|
|
|
|
|
|
+ !(dev->horkage & ATA_HORKAGE_NO_DMA_LOG)) {
|
|
tf.command = ATA_CMD_READ_LOG_DMA_EXT;
|
|
tf.command = ATA_CMD_READ_LOG_DMA_EXT;
|
|
tf.protocol = ATA_PROT_DMA;
|
|
tf.protocol = ATA_PROT_DMA;
|
|
dma = true;
|
|
dma = true;
|
|
@@ -2102,8 +2102,8 @@ retry:
|
|
buf, sectors * ATA_SECT_SIZE, 0);
|
|
buf, sectors * ATA_SECT_SIZE, 0);
|
|
|
|
|
|
if (err_mask && dma) {
|
|
if (err_mask && dma) {
|
|
- dev->horkage |= ATA_HORKAGE_NO_NCQ_LOG;
|
|
|
|
- ata_dev_warn(dev, "READ LOG DMA EXT failed, trying unqueued\n");
|
|
|
|
|
|
+ dev->horkage |= ATA_HORKAGE_NO_DMA_LOG;
|
|
|
|
+ ata_dev_warn(dev, "READ LOG DMA EXT failed, trying PIO\n");
|
|
goto retry;
|
|
goto retry;
|
|
}
|
|
}
|
|
|
|
|