diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-03 09:59:57 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-03 09:59:57 -0200 |
| commit | 083615f64a55fb88ffc65749c6ce147dd5d10b02 (patch) | |
| tree | fcd844f5eb44503eea2ca30e12b2cd970eba2793 /drivers/media | |
| parent | 4fbc8216b4de0486ffe74ed2b6ee4ebdbb37669d (diff) | |
| parent | 8fd0bda511406ef0e9dcce9be055d7ab931e92ba (diff) | |
Merge /home/v4l/v4l/for_upstream
* /home/v4l/v4l/for_upstream:
[media] em28xx: radio_fops should also use unlocked_ioctl
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 37b48a26c02a..f34d524ccb09 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c @@ -2365,7 +2365,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 = { |