aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core/v4l2-subdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-subdev.c')
-rw-r--r--drivers/media/v4l2-core/v4l2-subdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index b440cb66669c..d63083803144 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -535,7 +535,7 @@ v4l2_subdev_link_validate_get_format(struct media_pad *pad,
535 return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt); 535 return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt);
536 } 536 }
537 537
538 WARN(pad->entity->function != MEDIA_ENT_T_V4L2_VIDEO, 538 WARN(pad->entity->function != MEDIA_ENT_F_IO_V4L,
539 "Driver bug! Wrong media entity type 0x%08x, entity %s\n", 539 "Driver bug! Wrong media entity type 0x%08x, entity %s\n",
540 pad->entity->function, pad->entity->name); 540 pad->entity->function, pad->entity->name);
541 541
@@ -584,7 +584,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops)
584 sd->host_priv = NULL; 584 sd->host_priv = NULL;
585#if defined(CONFIG_MEDIA_CONTROLLER) 585#if defined(CONFIG_MEDIA_CONTROLLER)
586 sd->entity.name = sd->name; 586 sd->entity.name = sd->name;
587 sd->entity.function = MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN; 587 sd->entity.function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN;
588#endif 588#endif
589} 589}
590EXPORT_SYMBOL(v4l2_subdev_init); 590EXPORT_SYMBOL(v4l2_subdev_init);