diff options
| author |   James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:40:20 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:40:20 -0800 |
| commit | dc843ef00e79ef0466d4d66bb20beeccda92e003 (patch) | |
| tree | 7491381fdd81b6d40b25fec533e6f249d7823ce3 /drivers/ata | |
| parent | Linux 3.18-rc7 (diff) | |
| parent | scsi: set fmt to NULL scsi_extd_sense_format() by default (diff) | |
| download | linux-dev-dc843ef00e79ef0466d4d66bb20beeccda92e003.tar.xz linux-dev-dc843ef00e79ef0466d4d66bb20beeccda92e003.zip | |
Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 0586f66d70fa..fc6a60abe518 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1164,7 +1164,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev, depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id)); depth = min(ATA_MAX_QUEUE - 1, depth); - scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth); + scsi_adjust_queue_depth(sdev, depth); } blk_queue_flush_queueable(q, false); @@ -1282,7 +1282,7 @@ int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev, if (sdev->queue_depth == queue_depth) return -EINVAL; - scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth); + scsi_adjust_queue_depth(sdev, queue_depth); return queue_depth; } @@ -3570,7 +3570,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap); break; - case SERVICE_ACTION_IN: + case SERVICE_ACTION_IN_16: if ((scsicmd[1] & 0x1f) == SAI_READ_CAPACITY_16) ata_scsi_rbuf_fill(&args, ata_scsiop_read_cap); else |