1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index e364e86e84d7..94339c2aed1b 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -756,7 +756,7 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
 {
         struct ata_queued_cmd *qc;
 
-        qc = ata_qc_new_init(dev);
+        qc = ata_qc_new_init(dev, cmd->request->tag);
         if (qc) {
                 qc->scsicmd = cmd;
                 qc->scsidone = cmd->scsi_done;
@@ -3666,6 +3666,8 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)
                  */
                 shost->max_host_blocked = 1;
 
+                scsi_init_shared_tag_map(shost, host->n_tags);
+
                 rc = scsi_add_host_with_dma(ap->scsi_host,
                                                 &ap->tdev, ap->host->dev);
                 if (rc)