diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 14:49:52 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 14:49:52 +0200 |
| commit | 4128a6606c71fd177b71e2037f9da101cf967e50 (patch) | |
| tree | 0788ec5e6e39d47f8971c818d966df07cc8c6952 /include/media | |
| parent | f28f1c4529ddede4f033e4d55fad00c9df3afe10 (diff) | |
| parent | e99f775ed2f46b225106f0a156116a0080d16740 (diff) | |
Merge remote-tracking branch 'fscl/5.4-2.3.x-imx' into toradex_5.4-2.3.x-imx
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/media-dev-allocator.h | 2 | ||||
| -rw-r--r-- | include/media/v4l2-subdev.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/media/media-dev-allocator.h b/include/media/media-dev-allocator.h index b35ea6062596..2ab54d426c64 100644 --- a/include/media/media-dev-allocator.h +++ b/include/media/media-dev-allocator.h @@ -19,7 +19,7 @@ struct usb_device; -#if defined(CONFIG_MEDIA_CONTROLLER) && defined(CONFIG_USB) +#if defined(CONFIG_MEDIA_CONTROLLER) && IS_ENABLED(CONFIG_USB) /** * media_device_usb_allocate() - Allocate and return struct &media device * diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 67b4ecd4a727..2947db543ad9 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -163,6 +163,9 @@ struct v4l2_subdev_io_pin_config { * @s_gpio: set GPIO pins. Very simple right now, might need to be extended with * a direction argument if needed. * + * @command: called by in-kernel drivers in order to call functions internal + * to subdev drivers driver that have a separate callback. + * * @ioctl: called at the end of ioctl() syscall handler at the V4L2 core. * used to provide support for private ioctls used on the driver. * @@ -204,6 +207,7 @@ struct v4l2_subdev_core_ops { int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls); #endif + long (*command)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); #ifdef CONFIG_COMPAT long (*compat_ioctl32)(struct v4l2_subdev *sd, unsigned int cmd, |