Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
37b3c6a6
Commit
37b3c6a6
authored
Feb 15, 2018
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[poll] annotate SAA6588_CMD_POLL users
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
7928b2cb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
drivers/media/i2c/saa6588.c
drivers/media/i2c/saa6588.c
+2
-2
drivers/media/pci/bt8xx/bttv-driver.c
drivers/media/pci/bt8xx/bttv-driver.c
+2
-2
drivers/media/pci/saa7134/saa7134-video.c
drivers/media/pci/saa7134/saa7134-video.c
+2
-2
include/media/i2c/saa6588.h
include/media/i2c/saa6588.h
+1
-0
No files found.
drivers/media/i2c/saa6588.c
View file @
37b3c6a6
...
...
@@ -411,9 +411,9 @@ static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
break
;
/* --- poll() for /dev/radio --- */
case
SAA6588_CMD_POLL
:
a
->
result
=
0
;
a
->
poll_mask
=
0
;
if
(
s
->
data_available_for_read
)
a
->
result
|=
EPOLLIN
|
EPOLLRDNORM
;
a
->
poll_mask
|=
EPOLLIN
|
EPOLLRDNORM
;
poll_wait
(
a
->
instance
,
&
s
->
read_queue
,
a
->
event_list
);
break
;
...
...
drivers/media/pci/bt8xx/bttv-driver.c
View file @
37b3c6a6
...
...
@@ -3344,10 +3344,10 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
radio_enable
(
btv
);
cmd
.
instance
=
file
;
cmd
.
event_list
=
wait
;
cmd
.
result
=
res
;
cmd
.
poll_mask
=
res
;
bttv_call_all
(
btv
,
core
,
ioctl
,
SAA6588_CMD_POLL
,
&
cmd
);
return
cmd
.
result
;
return
cmd
.
poll_mask
;
}
static
const
struct
v4l2_file_operations
radio_fops
=
...
...
drivers/media/pci/saa7134/saa7134-video.c
View file @
37b3c6a6
...
...
@@ -1235,12 +1235,12 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
cmd
.
instance
=
file
;
cmd
.
event_list
=
wait
;
cmd
.
result
=
0
;
cmd
.
poll_mask
=
0
;
mutex_lock
(
&
dev
->
lock
);
saa_call_all
(
dev
,
core
,
ioctl
,
SAA6588_CMD_POLL
,
&
cmd
);
mutex_unlock
(
&
dev
->
lock
);
return
rc
|
cmd
.
result
;
return
rc
|
cmd
.
poll_mask
;
}
/* ------------------------------------------------------------------ */
...
...
include/media/i2c/saa6588.h
View file @
37b3c6a6
...
...
@@ -32,6 +32,7 @@ struct saa6588_command {
unsigned
char
__user
*
buffer
;
struct
file
*
instance
;
poll_table
*
event_list
;
__poll_t
poll_mask
;
};
/* These ioctls are internal to the kernel */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment