diff options
| author | Hans Verkuil | 2012-05-25 17:30:18 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2012-07-06 23:13:48 +0200 |
| commit | fcbd504989739897db0c7bd1c3e55e42c1682e21 (patch) | |
| tree | 35cc16cc75e0889ab1960b6fa551a2e8a99a63d5 | |
| parent | [media] cx88: don't use current_norm (diff) | |
| download | kernel-qcow2-linux-fcbd504989739897db0c7bd1c3e55e42c1682e21.tar.gz kernel-qcow2-linux-fcbd504989739897db0c7bd1c3e55e42c1682e21.tar.xz kernel-qcow2-linux-fcbd504989739897db0c7bd1c3e55e42c1682e21.zip | |
[media] cx88-blackbird: replace ioctl by unlocked_ioctl
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index e3bc8f7fcff4..843ffd9e533b 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c @@ -1089,7 +1089,7 @@ static const struct v4l2_file_operations mpeg_fops = .read = mpeg_read, .poll = mpeg_poll, .mmap = mpeg_mmap, - .ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2, }; static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { |