mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
staging: fieldbus: solve warning incorrect type dev_core.c
These changes solve a warning realated to an incorrect type inilizer in the function fieldbus_poll. Signed-off-by: Oscar Gomez Fuente <oscargomezf@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
deabe03523
commit
15cc5c284a
1 changed files with 3 additions and 3 deletions
|
@ -211,16 +211,16 @@ static ssize_t fieldbus_write(struct file *filp, const char __user *buf,
|
||||||
return fbdev->write_area(fbdev, buf, size, offset);
|
return fbdev->write_area(fbdev, buf, size, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int fieldbus_poll(struct file *filp, poll_table *wait)
|
static __poll_t fieldbus_poll(struct file *filp, poll_table *wait)
|
||||||
{
|
{
|
||||||
struct fb_open_file *of = filp->private_data;
|
struct fb_open_file *of = filp->private_data;
|
||||||
struct fieldbus_dev *fbdev = of->fbdev;
|
struct fieldbus_dev *fbdev = of->fbdev;
|
||||||
unsigned int mask = POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM;
|
__poll_t mask = EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM;
|
||||||
|
|
||||||
poll_wait(filp, &fbdev->dc_wq, wait);
|
poll_wait(filp, &fbdev->dc_wq, wait);
|
||||||
/* data changed ? */
|
/* data changed ? */
|
||||||
if (fbdev->dc_event != of->dc_event)
|
if (fbdev->dc_event != of->dc_event)
|
||||||
mask |= POLLPRI | POLLERR;
|
mask |= EPOLLPRI | EPOLLERR;
|
||||||
return mask;
|
return mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue