diff options
Diffstat (limited to 'drivers/ata/libata-scsi.c')
-rw-r--r-- | drivers/ata/libata-scsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 021cdc4cc260..5fd780e509d4 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -2354,10 +2354,10 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) | |||
2354 | qc->tf.command = ATA_CMD_PACKET; | 2354 | qc->tf.command = ATA_CMD_PACKET; |
2355 | 2355 | ||
2356 | if (ata_pio_use_silly(ap)) { | 2356 | if (ata_pio_use_silly(ap)) { |
2357 | qc->tf.protocol = ATA_PROT_ATAPI_DMA; | 2357 | qc->tf.protocol = ATAPI_PROT_DMA; |
2358 | qc->tf.feature |= ATAPI_PKT_DMA; | 2358 | qc->tf.feature |= ATAPI_PKT_DMA; |
2359 | } else { | 2359 | } else { |
2360 | qc->tf.protocol = ATA_PROT_ATAPI; | 2360 | qc->tf.protocol = ATAPI_PROT_PIO; |
2361 | qc->tf.lbam = SCSI_SENSE_BUFFERSIZE; | 2361 | qc->tf.lbam = SCSI_SENSE_BUFFERSIZE; |
2362 | qc->tf.lbah = 0; | 2362 | qc->tf.lbah = 0; |
2363 | } | 2363 | } |
@@ -2528,12 +2528,12 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc) | |||
2528 | if (using_pio || nodata) { | 2528 | if (using_pio || nodata) { |
2529 | /* no data, or PIO data xfer */ | 2529 | /* no data, or PIO data xfer */ |
2530 | if (nodata) | 2530 | if (nodata) |
2531 | qc->tf.protocol = ATA_PROT_ATAPI_NODATA; | 2531 | qc->tf.protocol = ATAPI_PROT_NODATA; |
2532 | else | 2532 | else |
2533 | qc->tf.protocol = ATA_PROT_ATAPI; | 2533 | qc->tf.protocol = ATAPI_PROT_PIO; |
2534 | } else { | 2534 | } else { |
2535 | /* DMA data xfer */ | 2535 | /* DMA data xfer */ |
2536 | qc->tf.protocol = ATA_PROT_ATAPI_DMA; | 2536 | qc->tf.protocol = ATAPI_PROT_DMA; |
2537 | qc->tf.feature |= ATAPI_PKT_DMA; | 2537 | qc->tf.feature |= ATAPI_PKT_DMA; |
2538 | 2538 | ||
2539 | if (atapi_dmadir && (scmd->sc_data_direction != DMA_TO_DEVICE)) | 2539 | if (atapi_dmadir && (scmd->sc_data_direction != DMA_TO_DEVICE)) |