aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-01-16 13:34:28 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2019-06-02 12:00:05 +0200
commit12a74f75166c58f745aca159bd0387b6e42620bc (patch)
treea1c1b12c6c95a40b7bff27c9c99d5f30e7749dd6
parente7a44ad8a380e9cf65a59320ad7dd0262822afd1 (diff)
radio-si476x: fix epoll
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--drivers/media/radio/radio-si476x.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
index 0261f4d28f16..0457b6bf6d80 100644
--- a/drivers/media/radio/radio-si476x.c
+++ b/drivers/media/radio/radio-si476x.c
@@ -1158,9 +1158,8 @@ static __poll_t si476x_radio_fops_poll(struct file *file,
__poll_t req_events = poll_requested_events(pts);
__poll_t err = v4l2_ctrl_poll(file, pts);
+ poll_wait(file, &radio->core->rds_read_queue, pts);
if (req_events & (EPOLLIN | EPOLLRDNORM)) {
- if (atomic_read(&radio->core->is_alive))
- poll_wait(file, &radio->core->rds_read_queue, pts);
if (!atomic_read(&radio->core->is_alive))
err = EPOLLHUP;

Privacy Policy