diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2013-07-24 16:22:57 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 22:49:57 -0700 |
| commit | 5290801c23231c8e192943d3beb01fdbeb536395 (patch) | |
| tree | 856e2e7008c6c4d01085a073b64a0a7fa47f1745 /drivers/misc | |
| parent | cc33c537c12f36e9ce753c308999cc2e93195112 (diff) | |
| download | kernel-common-5290801c23231c8e192943d3beb01fdbeb536395.tar.gz kernel-common-5290801c23231c8e192943d3beb01fdbeb536395.tar.bz2 kernel-common-5290801c23231c8e192943d3beb01fdbeb536395.zip | |
mei: wake also writers on reset
wake writers otherwise might have processes waiting
endlessly on wait_tx during reset
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/client.c | 10 | ||||
| -rw-r--r-- | drivers/misc/mei/client.h | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/init.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index 21d3f5aa8353..af1e60205140 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c @@ -892,18 +892,22 @@ void mei_cl_all_disconnect(struct mei_device *dev) /** - * mei_cl_all_read_wakeup - wake up all readings so they can be interrupted + * mei_cl_all_wakeup - wake up all readers and writers they can be interrupted * * @dev - mei device */ -void mei_cl_all_read_wakeup(struct mei_device *dev) +void mei_cl_all_wakeup(struct mei_device *dev) { struct mei_cl *cl, *next; list_for_each_entry_safe(cl, next, &dev->file_list, link) { if (waitqueue_active(&cl->rx_wait)) { - dev_dbg(&dev->pdev->dev, "Waking up client!\n"); + dev_dbg(&dev->pdev->dev, "Waking up reading client!\n"); wake_up_interruptible(&cl->rx_wait); } + if (waitqueue_active(&cl->tx_wait)) { + dev_dbg(&dev->pdev->dev, "Waking up writing client!\n"); + wake_up_interruptible(&cl->tx_wait); + } } } diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h index 26b157d8bad5..9bae4c724603 100644 --- a/drivers/misc/mei/client.h +++ b/drivers/misc/mei/client.h @@ -99,7 +99,7 @@ void mei_host_client_init(struct work_struct *work); void mei_cl_all_disconnect(struct mei_device *dev); -void mei_cl_all_read_wakeup(struct mei_device *dev); +void mei_cl_all_wakeup(struct mei_device *dev); void mei_cl_all_write_clear(struct mei_device *dev); #endif /* _MEI_CLIENT_H_ */ diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index ed1d75203af6..7929e14627ba 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -196,7 +196,7 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) mei_hbm_start_req(dev); /* wake up all readings so they can be interrupted */ - mei_cl_all_read_wakeup(dev); + mei_cl_all_wakeup(dev); /* remove all waiting requests */ mei_cl_all_write_clear(dev); |