diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2016-01-07 14:46:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-07 17:03:43 -0800 |
| commit | ed6dc538e5a36a331b6256d54f435c80f6715460 (patch) | |
| tree | 00da8479bf04907e2d3639aa5ac3faac5e35fd78 | |
| parent | e0a7f1f04cd9bb13df7503ba7156ff0a37c9f460 (diff) | |
| download | blackbird-op-linux-ed6dc538e5a36a331b6256d54f435c80f6715460.tar.gz blackbird-op-linux-ed6dc538e5a36a331b6256d54f435c80f6715460.zip | |
mei: fix fasync return value on error
fasync should return a negative value on error
and not poll mask POLLERR.
Cc: <stable@vger.kernel.org> # 4.3+
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/mei/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index b2f2486b3d75..677d0362f334 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c @@ -657,7 +657,9 @@ out: * @file: pointer to file structure * @band: band bitmap * - * Return: poll mask + * Return: negative on error, + * 0 if it did no changes, + * and positive a process was added or deleted */ static int mei_fasync(int fd, struct file *file, int band) { @@ -665,7 +667,7 @@ static int mei_fasync(int fd, struct file *file, int band) struct mei_cl *cl = file->private_data; if (!mei_cl_is_connected(cl)) - return POLLERR; + return -ENODEV; return fasync_helper(fd, file, band, &cl->ev_async); } |
