diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2016-08-01 12:34:01 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-08-01 12:34:01 -0500 |
| commit | 9454c23852ca6d7aec89fd6fd46a046c323caac3 (patch) | |
| tree | 794be65345027b5adea3720a43124fee338333a5 /drivers/misc | |
| parent | Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-dra7xx', 'pci/host-hv', 'pci/host-vmd' and 'pci/host-xilinx' into next (diff) | |
| parent | PCI: Spread interrupt vectors in pci_alloc_irq_vectors() (diff) | |
| download | linux-dev-9454c23852ca6d7aec89fd6fd46a046c323caac3.tar.xz linux-dev-9454c23852ca6d7aec89fd6fd46a046c323caac3.zip | |
Merge branch 'pci/msi-affinity' into next
Conflicts:
drivers/nvme/host/pci.c
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/client.c | 2 |
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); } } |