summaryrefslogtreecommitdiff
path: root/drivers/misc/mei
diff options
context:
space:
mode:
authorAlexander Usyskin <alexander.usyskin@intel.com>2016-05-24 20:03:38 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-30 12:35:14 (GMT)
commit9fa0be8bb66a42a5f75e00a54732c92f3772aa6e (patch)
treeca7e89912ca7c152e86b47dbde5a05d62d2b75ec /drivers/misc/mei
parentbca7dbacfd4c7f1f069a70e241e39aea5bd85808 (diff)
downloadlinux-9fa0be8bb66a42a5f75e00a54732c92f3772aa6e.tar.xz
mei: amthif: enable poll for async events
Currently the poll function is bailing early for amthif client and ignores requests for async events notifications. Move async event processing before amthif to enable async events notifications on amthif client. Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
-rw-r--r--drivers/misc/mei/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 622ff19..a8d0471 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -609,17 +609,17 @@ static unsigned int mei_poll(struct file *file, poll_table *wait)
goto out;
}
- if (cl == &dev->iamthif_cl) {
- mask = mei_amthif_poll(file, wait);
- goto out;
- }
-
if (notify_en) {
poll_wait(file, &cl->ev_wait, wait);
if (cl->notify_ev)
mask |= POLLPRI;
}
+ if (cl == &dev->iamthif_cl) {
+ mask |= mei_amthif_poll(file, wait);
+ goto out;
+ }
+
if (req_events & (POLLIN | POLLRDNORM)) {
poll_wait(file, &cl->rx_wait, wait);