summaryrefslogtreecommitdiff
path: root/drivers/virt
diff options
context:
space:
mode:
authorAndra Paraschiv <andraprs@amazon.com>2020-11-02 19:36:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-09 18:20:36 +0100
commitd9109fe0f30a1fba66b8623837fc3d3c1a031090 (patch)
treee5fdb76421480f9c0f99fa4af63445d17caa7258 /drivers/virt
parent3ed1cfb2cee4355ddef49489897bfe474daeeaec (diff)
downloadlwn-d9109fe0f30a1fba66b8623837fc3d3c1a031090.tar.gz
lwn-d9109fe0f30a1fba66b8623837fc3d3c1a031090.zip
nitro_enclaves: Fixup type and simplify logic of the poll mask setup
Update the assigned value of the poll result to be EPOLLHUP instead of POLLHUP to match the __poll_t type. While at it, simplify the logic of setting the mask result of the poll function. Reported-by: kernel test robot <lkp@intel.com> Reviewed-by: Alexander Graf <graf@amazon.com> Signed-off-by: Andra Paraschiv <andraprs@amazon.com> Link: https://lore.kernel.org/r/20201102173622.32169-1-andraprs@amazon.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/virt')
-rw-r--r--drivers/virt/nitro_enclaves/ne_misc_dev.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index f06622b48d69..f1964ea4b826 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
@@ -1505,10 +1505,8 @@ static __poll_t ne_enclave_poll(struct file *file, poll_table *wait)
poll_wait(file, &ne_enclave->eventq, wait);
- if (!ne_enclave->has_event)
- return mask;
-
- mask = POLLHUP;
+ if (ne_enclave->has_event)
+ mask |= EPOLLHUP;
return mask;
}