diff --git a/[refs] b/[refs]
index 539d7ee69603..600f32d8e8c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87d6a412bd1ed82c14cabd4b408003b23bbd2880
+refs/heads/master: 615cc2211c17ed05a2a5d94abdac6c340a8ea508
diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c
index 1afa08527e08..c579dcc9200c 100644
--- a/trunk/drivers/vhost/vhost.c
+++ b/trunk/drivers/vhost/vhost.c
@@ -298,6 +298,7 @@ static long vhost_dev_set_owner(struct vhost_dev *dev)
 	return 0;
 err_cgroup:
 	kthread_stop(worker);
+	dev->worker = NULL;
 err_worker:
 	if (dev->mm)
 		mmput(dev->mm);