Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / scsi / isci / request.c

diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 56e3809..cfd0084 100644 (file)
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -694,7 +694,7 @@ sci_io_request_construct_sata(struct isci_request *ireq,
        }
 
        /* ATAPI */
-       if (dev->sata_dev.command_set == ATAPI_COMMAND_SET &&
+       if (dev->sata_dev.class == ATA_DEV_ATAPI &&
            task->ata_task.fis.command == ATA_CMD_PACKET) {
                sci_atapi_construct(ireq);
                return SCI_SUCCESS;
@@ -2980,7 +2980,7 @@ static void sci_request_started_state_enter(struct sci_base_state_machine *sm)
                state = SCI_REQ_SMP_WAIT_RESP;
        } else if (task && sas_protocol_ata(task->task_proto) &&
                   !task->ata_task.use_ncq) {
-               if (dev->sata_dev.command_set == ATAPI_COMMAND_SET &&
+               if (dev->sata_dev.class == ATA_DEV_ATAPI &&
                        task->ata_task.fis.command == ATA_CMD_PACKET) {
                        state = SCI_REQ_ATAPI_WAIT_H2D;
                } else if (task->data_dir == DMA_NONE) {