Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / vhost / test.c

diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 329d3021d059b3c5f543585eebd884f15ff9ad61..1ee45bc85f672100e0b4e2728c8e60d42bc5880a 100644 (file)
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -219,13 +219,20 @@ static long vhost_test_reset_owner(struct vhost_test *n)
 {
        void *priv = NULL;
        long err;
+       struct vhost_memory *memory;
+
        mutex_lock(&n->dev.mutex);
        err = vhost_dev_check_owner(&n->dev);
        if (err)
                goto done;
+       memory = vhost_dev_reset_owner_prepare();
+       if (!memory) {
+               err = -ENOMEM;
+               goto done;
+       }
        vhost_test_stop(n, &priv);
        vhost_test_flush(n);
-       err = vhost_dev_reset_owner(&n->dev);
+       vhost_dev_reset_owner(&n->dev, memory);
 done:
        mutex_unlock(&n->dev.mutex);
        return err;