diff options
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/sata_mv.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 3ce7c198ff0d..9e5cb9f748e6 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c | |||
| @@ -2412,7 +2412,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) | |||
| 2412 | 2412 | ||
| 2413 | if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN) | 2413 | if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN) |
| 2414 | goto invalid_fld; | 2414 | goto invalid_fld; |
| 2415 | 2415 | ||
| 2416 | /* We may not issue DMA commands if no DMA mode is set */ | 2416 | /* We may not issue DMA commands if no DMA mode is set */ |
| 2417 | if (tf->protocol == ATA_PROT_DMA && dev->dma_mode == 0) | 2417 | if (tf->protocol == ATA_PROT_DMA && dev->dma_mode == 0) |
| 2418 | goto invalid_fld; | 2418 | goto invalid_fld; |
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index eb5f8bcd03c1..691c115ac8e1 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
| @@ -1377,7 +1377,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant, | |||
| 1377 | /* Note that DEV_IRQ might happen spuriously during EDMA, | 1377 | /* Note that DEV_IRQ might happen spuriously during EDMA, |
| 1378 | * and should be ignored in such cases. | 1378 | * and should be ignored in such cases. |
| 1379 | * The cause of this is still under investigation. | 1379 | * The cause of this is still under investigation. |
| 1380 | */ | 1380 | */ |
| 1381 | if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) { | 1381 | if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) { |
| 1382 | /* EDMA: check for response queue interrupt */ | 1382 | /* EDMA: check for response queue interrupt */ |
| 1383 | if ((CRPB_DMA_DONE << hard_port) & hc_irq_cause) { | 1383 | if ((CRPB_DMA_DONE << hard_port) & hc_irq_cause) { |
