From fb969d158fb6a52a35dbbff37f25855805c9597a Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 13 Jun 2012 16:56:31 +0200
Subject: [PATCH] --- yaml --- r: 316825 b: refs/heads/master c:
 b5ee8f2802c559fccb177c0a117f5cd56c1049cc h: refs/heads/master i:   316823:
 8ea6f16ad2028bbfb1e33361d77dc126e1fb388f v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/scsi/virtio_scsi.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a215f157b425..489496f220db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a752359f2b0a291c5f229e883842e4b30c698387
+refs/heads/master: b5ee8f2802c559fccb177c0a117f5cd56c1049cc
diff --git a/trunk/drivers/scsi/virtio_scsi.c b/trunk/drivers/scsi/virtio_scsi.c
index 1b3843117268..b0ad5aa6b552 100644
--- a/trunk/drivers/scsi/virtio_scsi.c
+++ b/trunk/drivers/scsi/virtio_scsi.c
@@ -264,9 +264,11 @@ static int virtscsi_kick_cmd(struct virtio_scsi *vscsi, struct virtqueue *vq,
 
 	ret = virtqueue_add_buf(vq, vscsi->sg, out_num, in_num, cmd, gfp);
 	if (ret >= 0)
-		virtqueue_kick(vq);
+		ret = virtqueue_kick_prepare(vq);
 
 	spin_unlock_irqrestore(&vscsi->vq_lock, flags);
+	if (ret > 0)
+		virtqueue_notify(vq);
 	return ret;
 }