Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index ec91bd07f00a..c680d7641311 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -534,7 +534,9 @@ static int virtscsi_queuecommand(struct virtio_scsi *vscsi,
 {
         struct Scsi_Host *shost = virtio_scsi_host(vscsi->vdev);
         struct virtio_scsi_cmd *cmd = scsi_cmd_priv(sc);
+        unsigned long flags;
         int req_size;
+        int ret;
 
         BUG_ON(scsi_sg_count(sc) > shost->sg_tablesize);
 
@@ -562,8 +564,15 @@ static int virtscsi_queuecommand(struct virtio_scsi *vscsi,
                 req_size = sizeof(cmd->req.cmd);
         }
 
-        if (virtscsi_kick_cmd(req_vq, cmd, req_size, sizeof(cmd->resp.cmd)) != 0)
+        ret = virtscsi_kick_cmd(req_vq, cmd, req_size, sizeof(cmd->resp.cmd));
+        if (ret == -EIO) {
+                cmd->resp.cmd.response = VIRTIO_SCSI_S_BAD_TARGET;
+                spin_lock_irqsave(&req_vq->vq_lock, flags);
+                virtscsi_complete_cmd(vscsi, cmd);
+                spin_unlock_irqrestore(&req_vq->vq_lock, flags);
+        } else if (ret != 0) {
                 return SCSI_MLQUEUE_HOST_BUSY;
+        }
         return 0;
 }