diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
| commit | a292241cccb7e20e8b997a9a44177e7c98141859 (patch) | |
| tree | a0b0bb95e7dce3233a2d8b203f9e326cdec7a00e /tools/virtio/virtio_test.c | |
| parent | d49cb7aeebb974713f9f7ab2991352d3050b095b (diff) | |
| parent | 68807a0c2015cb40df4869e16651f0ce5cc14d52 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 3.16.
Diffstat (limited to 'tools/virtio/virtio_test.c')
| -rw-r--r-- | tools/virtio/virtio_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c index bdb71a26ae35..00ea679b3826 100644 --- a/tools/virtio/virtio_test.c +++ b/tools/virtio/virtio_test.c | |||
| @@ -172,7 +172,7 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq, | |||
| 172 | GFP_ATOMIC); | 172 | GFP_ATOMIC); |
| 173 | if (likely(r == 0)) { | 173 | if (likely(r == 0)) { |
| 174 | ++started; | 174 | ++started; |
| 175 | if (unlikely(!virtqueue_kick(vq->vq)) | 175 | if (unlikely(!virtqueue_kick(vq->vq))) |
| 176 | r = -1; | 176 | r = -1; |
| 177 | } | 177 | } |
| 178 | } else | 178 | } else |