summaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-07-03 22:25:56 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-11-27 16:19:53 -0500
commite6c8adca20ba459dd88057ca74232bf9f1045075 (patch)
tree708ae6987fcd37a5a757825aeb84c74843809999 /drivers/media/v4l2-core
parenta3f8683bf7d5e6254fe68f5c5d3585e27eea8ed0 (diff)
downloadlinux-stable-e6c8adca20ba459dd88057ca74232bf9f1045075.tar.gz
linux-stable-e6c8adca20ba459dd88057ca74232bf9f1045075.tar.bz2
linux-stable-e6c8adca20ba459dd88057ca74232bf9f1045075.zip
anntotate the places where ->poll() return values go
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r--drivers/media/v4l2-core/v4l2-dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index c647ba648805..ef178edc634b 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -334,7 +334,7 @@ static ssize_t v4l2_write(struct file *filp, const char __user *buf,
static unsigned int v4l2_poll(struct file *filp, struct poll_table_struct *poll)
{
struct video_device *vdev = video_devdata(filp);
- unsigned int res = POLLERR | POLLHUP;
+ __poll_t res = POLLERR | POLLHUP;
if (!vdev->fops->poll)
return DEFAULT_POLLMASK;