summaryrefslogtreecommitdiff
path: root/drivers/misc/mei
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 17:29:44 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 17:29:44 +0300
commit194c8581eb9b6d42e9232c7693d86d2ee3799986 (patch)
tree86d926b7407c33379dd719fad2ccaf03d5c5228a /drivers/misc/mei
parentc0ff9019ee64101fda8f19338da799fda8217e14 (diff)
parent33688abb2802ff3a230bd2441f765477b94cc89e (diff)
downloadlinux-194c8581eb9b6d42e9232c7693d86d2ee3799986.tar.xz
Merge 4.7-rc4 into char-misc-next
We want those fixes in here to help with merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
-rw-r--r--drivers/misc/mei/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index eed254da63a8..641c1a566687 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -730,7 +730,7 @@ static void mei_cl_wake_all(struct mei_cl *cl)
/* synchronized under device mutex */
if (waitqueue_active(&cl->wait)) {
cl_dbg(dev, cl, "Waking up ctrl write clients!\n");
- wake_up_interruptible(&cl->wait);
+ wake_up(&cl->wait);
}
}