From 954140d30b92a419230947e372b56b45f63e90f5 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 31 Aug 2010 02:05:57 +0000
Subject: [PATCH] --- yaml --- r: 210261 b: refs/heads/master c:
 78b620ce9e168d08ecfac2f4bb056c511b0601ec h: refs/heads/master i:   210259:
 2421db967b554ea9417555e3070ca389c2f7054c v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/vhost/vhost.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8fd48a202c7d..88d3005a7b70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa8a9e25c5e865de85410be4e9269b552974f7a2
+refs/heads/master: 78b620ce9e168d08ecfac2f4bb056c511b0601ec
diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c
index e05557d52999..4b99117f3ecd 100644
--- a/trunk/drivers/vhost/vhost.c
+++ b/trunk/drivers/vhost/vhost.c
@@ -323,7 +323,10 @@ void vhost_dev_cleanup(struct vhost_dev *dev)
 	dev->mm = NULL;
 
 	WARN_ON(!list_empty(&dev->work_list));
-	kthread_stop(dev->worker);
+	if (dev->worker) {
+		kthread_stop(dev->worker);
+		dev->worker = NULL;
+	}
 }
 
 static int log_access_ok(void __user *log_base, u64 addr, unsigned long sz)