Skip to content

Commit 37b3c6a

Browse files
author
Al Viro
committed
[poll] annotate SAA6588_CMD_POLL users
Signed-off-by: Al Viro <[email protected]>
1 parent 7928b2c commit 37b3c6a

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

drivers/media/i2c/saa6588.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@ static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
411411
break;
412412
/* --- poll() for /dev/radio --- */
413413
case SAA6588_CMD_POLL:
414-
a->result = 0;
414+
a->poll_mask = 0;
415415
if (s->data_available_for_read)
416-
a->result |= EPOLLIN | EPOLLRDNORM;
416+
a->poll_mask |= EPOLLIN | EPOLLRDNORM;
417417
poll_wait(a->instance, &s->read_queue, a->event_list);
418418
break;
419419

drivers/media/pci/bt8xx/bttv-driver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3344,10 +3344,10 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
33443344
radio_enable(btv);
33453345
cmd.instance = file;
33463346
cmd.event_list = wait;
3347-
cmd.result = res;
3347+
cmd.poll_mask = res;
33483348
bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd);
33493349

3350-
return cmd.result;
3350+
return cmd.poll_mask;
33513351
}
33523352

33533353
static const struct v4l2_file_operations radio_fops =

drivers/media/pci/saa7134/saa7134-video.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,12 +1235,12 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
12351235

12361236
cmd.instance = file;
12371237
cmd.event_list = wait;
1238-
cmd.result = 0;
1238+
cmd.poll_mask = 0;
12391239
mutex_lock(&dev->lock);
12401240
saa_call_all(dev, core, ioctl, SAA6588_CMD_POLL, &cmd);
12411241
mutex_unlock(&dev->lock);
12421242

1243-
return rc | cmd.result;
1243+
return rc | cmd.poll_mask;
12441244
}
12451245

12461246
/* ------------------------------------------------------------------ */

include/media/i2c/saa6588.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ struct saa6588_command {
3232
unsigned char __user *buffer;
3333
struct file *instance;
3434
poll_table *event_list;
35+
__poll_t poll_mask;
3536
};
3637

3738
/* These ioctls are internal to the kernel */

0 commit comments

Comments
 (0)