diff options
-rw-r--r-- | drivers/ata/libata-core.c | 4 | ||||
-rw-r--r-- | drivers/ata/libata-sff.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c1444d8f92c6..781d0959a228 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -1291,7 +1291,7 @@ unsigned ata_exec_internal_sg(struct ata_device *dev, | |||
1291 | if (ap->ops->post_internal_cmd) | 1291 | if (ap->ops->post_internal_cmd) |
1292 | ap->ops->post_internal_cmd(qc); | 1292 | ap->ops->post_internal_cmd(qc); |
1293 | 1293 | ||
1294 | if (qc->flags & ATA_QCFLAG_FAILED && !qc->err_mask) { | 1294 | if ((qc->flags & ATA_QCFLAG_FAILED) && !qc->err_mask) { |
1295 | if (ata_msg_warn(ap)) | 1295 | if (ata_msg_warn(ap)) |
1296 | ata_dev_printk(dev, KERN_WARNING, | 1296 | ata_dev_printk(dev, KERN_WARNING, |
1297 | "zero err_mask for failed " | 1297 | "zero err_mask for failed " |
@@ -2492,7 +2492,7 @@ int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev) | |||
2492 | for (i = 0; i < ATA_MAX_DEVICES; i++) { | 2492 | for (i = 0; i < ATA_MAX_DEVICES; i++) { |
2493 | dev = &ap->device[i]; | 2493 | dev = &ap->device[i]; |
2494 | 2494 | ||
2495 | /* don't udpate suspended devices' xfer mode */ | 2495 | /* don't update suspended devices' xfer mode */ |
2496 | if (!ata_dev_ready(dev)) | 2496 | if (!ata_dev_ready(dev)) |
2497 | continue; | 2497 | continue; |
2498 | 2498 | ||
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index cfa9ed179d9c..9bbc8749620a 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -775,7 +775,7 @@ void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
775 | * really a timeout event, adjust error mask and | 775 | * really a timeout event, adjust error mask and |
776 | * cancel frozen state. | 776 | * cancel frozen state. |
777 | */ | 777 | */ |
778 | if (qc->err_mask == AC_ERR_TIMEOUT && host_stat & ATA_DMA_ERR) { | 778 | if (qc->err_mask == AC_ERR_TIMEOUT && (host_stat & ATA_DMA_ERR)) { |
779 | qc->err_mask = AC_ERR_HOST_BUS; | 779 | qc->err_mask = AC_ERR_HOST_BUS; |
780 | thaw = 1; | 780 | thaw = 1; |
781 | } | 781 | } |