summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-08-09 14:19:09 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-08-09 14:19:09 +1000
commit8ec8d34957e1a581777caffb67326b67a04b2f39 (patch)
tree53babe1a3093e2ba7023881c74a9c8ad081f56ba /drivers
parent88f8fcc6fb3b0ca2b21951128d5728f5ae134562 (diff)
parent8c325eed6438d5262e6e74df32eb40b1e657a967 (diff)
Merge remote-tracking branch 'vhost/linux-next'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/vhost/vhost.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index e58cf0001cee..4c19ca1781c3 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -161,9 +161,11 @@ void vhost_work_queue(struct vhost_dev *dev, struct vhost_work *work)
if (list_empty(&work->node)) {
list_add_tail(&work->node, &dev->work_list);
work->queue_seq++;
+ spin_unlock_irqrestore(&dev->work_lock, flags);
wake_up_process(dev->worker);
+ } else {
+ spin_unlock_irqrestore(&dev->work_lock, flags);
}
- spin_unlock_irqrestore(&dev->work_lock, flags);
}
EXPORT_SYMBOL_GPL(vhost_work_queue);