diff options
| author | Sandor Yu <R01008@freescale.com> | 2015-09-01 15:15:48 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:23:15 +0800 |
| commit | 8ad0af32d9ad518612325a84045c9b5d212c4ae6 (patch) | |
| tree | 0356d73689d30acfbd6c06f7e20abed52b3bd895 /include/media | |
| parent | 1be1cbfead2962eecf85ac143bc332c4ce5526d5 (diff) | |
MLK-11508-1: Revert "[media] v4l2-core: remove the old .ioctl BKL replacement"
This reverts commit 5cf6f7f327c95f09be859889be39e78950516556.
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/v4l2-dev.h | 1 | ||||
| -rw-r--r-- | include/media/v4l2-device.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 28a686eb7d09..6cd753236213 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -153,6 +153,7 @@ struct v4l2_file_operations { ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); unsigned int (*poll) (struct file *, struct poll_table_struct *); + long (*ioctl) (struct file *, unsigned int, unsigned long); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); #ifdef CONFIG_COMPAT long (*compat_ioctl32) (struct file *, unsigned int, unsigned long); diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index 8ffa94009d1a..bb97f64e91c8 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h @@ -69,6 +69,8 @@ struct v4l2_device { unsigned int notification, void *arg); struct v4l2_ctrl_handler *ctrl_handler; struct v4l2_prio_state prio; + /* BKL replacement mutex. Temporary solution only. */ + struct mutex ioctl_lock; struct kref ref; void (*release)(struct v4l2_device *v4l2_dev); }; |