diff options
| author | Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> | 2022-04-12 10:42:41 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-04-24 08:15:23 +0100 |
| commit | e550c3709237b8fa5740dfba3f513e1d5bd9c6c8 (patch) | |
| tree | b05f5a128aec807ac1717b906c52b444ae8472b8 | |
| parent | dadd47d46818c7587f769287aa4acca152d48039 (diff) | |
| download | linux-e550c3709237b8fa5740dfba3f513e1d5bd9c6c8.tar.gz linux-e550c3709237b8fa5740dfba3f513e1d5bd9c6c8.tar.bz2 linux-e550c3709237b8fa5740dfba3f513e1d5bd9c6c8.zip | |
media: v4l2-subdev: drop extra #ifdef
subdev_open() is inside #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API, which
depends on CONFIG_MEDIA_CONTROLLER, so there's no need for an extra
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-subdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 30eb50407db5..2f24ef75872b 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -63,7 +63,7 @@ static int subdev_open(struct file *file) v4l2_fh_init(&subdev_fh->vfh, vdev); v4l2_fh_add(&subdev_fh->vfh); file->private_data = &subdev_fh->vfh; -#if defined(CONFIG_MEDIA_CONTROLLER) + if (sd->v4l2_dev->mdev && sd->entity.graph_obj.mdev->dev) { struct module *owner; @@ -74,7 +74,6 @@ static int subdev_open(struct file *file) } subdev_fh->owner = owner; } -#endif if (sd->internal_ops && sd->internal_ops->open) { ret = sd->internal_ops->open(sd, subdev_fh); |