diff options
Diffstat (limited to 'drivers/media/video/s5p-mfc/s5p_mfc.c')
-rw-r--r-- | drivers/media/video/s5p-mfc/s5p_mfc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc.c b/drivers/media/video/s5p-mfc/s5p_mfc.c index 83fe461af26..76008549b3f 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc.c +++ b/drivers/media/video/s5p-mfc/s5p_mfc.c | |||
@@ -1048,6 +1048,10 @@ static int s5p_mfc_probe(struct platform_device *pdev) | |||
1048 | vfd->ioctl_ops = get_dec_v4l2_ioctl_ops(); | 1048 | vfd->ioctl_ops = get_dec_v4l2_ioctl_ops(); |
1049 | vfd->release = video_device_release, | 1049 | vfd->release = video_device_release, |
1050 | vfd->lock = &dev->mfc_mutex; | 1050 | vfd->lock = &dev->mfc_mutex; |
1051 | /* Locking in file operations other than ioctl should be done | ||
1052 | by the driver, not the V4L2 core. | ||
1053 | This driver needs auditing so that this flag can be removed. */ | ||
1054 | set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags); | ||
1051 | vfd->v4l2_dev = &dev->v4l2_dev; | 1055 | vfd->v4l2_dev = &dev->v4l2_dev; |
1052 | snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_DEC_NAME); | 1056 | snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_DEC_NAME); |
1053 | dev->vfd_dec = vfd; | 1057 | dev->vfd_dec = vfd; |
@@ -1072,6 +1076,8 @@ static int s5p_mfc_probe(struct platform_device *pdev) | |||
1072 | vfd->ioctl_ops = get_enc_v4l2_ioctl_ops(); | 1076 | vfd->ioctl_ops = get_enc_v4l2_ioctl_ops(); |
1073 | vfd->release = video_device_release, | 1077 | vfd->release = video_device_release, |
1074 | vfd->lock = &dev->mfc_mutex; | 1078 | vfd->lock = &dev->mfc_mutex; |
1079 | /* This should not be necessary */ | ||
1080 | set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags); | ||
1075 | vfd->v4l2_dev = &dev->v4l2_dev; | 1081 | vfd->v4l2_dev = &dev->v4l2_dev; |
1076 | snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_ENC_NAME); | 1082 | snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_ENC_NAME); |
1077 | dev->vfd_enc = vfd; | 1083 | dev->vfd_enc = vfd; |