projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46e67ac
)
[media] em28xx: radio_fops should also use unlocked_ioctl
author
Hans Verkuil
<
[email protected]
>
Sat, 18 Dec 2010 12:59:51 +0000
(09:59 -0300)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Mon, 3 Jan 2011 11:52:25 +0000
(09:52 -0200)
em28xx uses core assisted locking, so it shouldn't use .ioctl.
The .ioctl callback was replaced by .unlocked_ioctl for video nodes,
but not for radio nodes. This is now corrected.
Signed-off-by: Hans Verkuil <
[email protected]
>
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
drivers/media/video/em28xx/em28xx-video.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/em28xx/em28xx-video.c
b/drivers/media/video/em28xx/em28xx-video.c
index 908e3bc88303989c10f6ae8950286a820d2132e9..2c3007280032ea5472e45e9b1c75ee38aaa36b4c 100644
(file)
--- a/
drivers/media/video/em28xx/em28xx-video.c
+++ b/
drivers/media/video/em28xx/em28xx-video.c
@@
-2377,7
+2377,7
@@
static const struct v4l2_file_operations radio_fops = {
.owner = THIS_MODULE,
.open = em28xx_v4l2_open,
.release = em28xx_v4l2_close,
- .
ioctl
= video_ioctl2,
+ .
unlocked_ioctl
= video_ioctl2,
};
static const struct v4l2_ioctl_ops radio_ioctl_ops = {