diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2014-06-16 04:32:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-06-19 13:14:51 -0300 |
| commit | 13936af3d2f04f173a83cc050dbc4b20d8562b81 (patch) | |
| tree | bd28056e7cd83b399146e61455007510e9a8dbd6 /drivers/media | |
| parent | f71920efb1066d71d74811e1dbed658173adf9bf (diff) | |
| download | talos-obmc-linux-13936af3d2f04f173a83cc050dbc4b20d8562b81.tar.gz talos-obmc-linux-13936af3d2f04f173a83cc050dbc4b20d8562b81.zip | |
[media] saa7134: use unlocked_ioctl instead of ioctl
The saa7134 driver uses core-locking, so there is no longer any need
to use the ioctl op instead of the unlocked_ioctl op. This change
was forgotten for the saa7134-empress.c, so fix this.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-empress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c index e65c760e4e8b..0006d6bf8c18 100644 --- a/drivers/media/pci/saa7134/saa7134-empress.c +++ b/drivers/media/pci/saa7134/saa7134-empress.c @@ -179,7 +179,7 @@ static const struct v4l2_file_operations ts_fops = .read = vb2_fop_read, .poll = vb2_fop_poll, .mmap = vb2_fop_mmap, - .ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2, }; static const struct v4l2_ioctl_ops ts_ioctl_ops = { |
