[media] v4l: Don't warn during link validation when encountering a V4L2 devnode
v4l2_subdev_link_validate_get_format() retrieves the remote pad format depending on the entity type and prints a warning if the entity type is not supported. The type check doesn't take the subtype into account, and thus always prints a warning for device node types, even when supported. Fix it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
b6f50b49b9
commit
864a121274
|
@ -412,20 +412,20 @@ static int
|
||||||
v4l2_subdev_link_validate_get_format(struct media_pad *pad,
|
v4l2_subdev_link_validate_get_format(struct media_pad *pad,
|
||||||
struct v4l2_subdev_format *fmt)
|
struct v4l2_subdev_format *fmt)
|
||||||
{
|
{
|
||||||
switch (media_entity_type(pad->entity)) {
|
if (media_entity_type(pad->entity) == MEDIA_ENT_T_V4L2_SUBDEV) {
|
||||||
case MEDIA_ENT_T_V4L2_SUBDEV:
|
struct v4l2_subdev *sd =
|
||||||
|
media_entity_to_v4l2_subdev(pad->entity);
|
||||||
|
|
||||||
fmt->which = V4L2_SUBDEV_FORMAT_ACTIVE;
|
fmt->which = V4L2_SUBDEV_FORMAT_ACTIVE;
|
||||||
fmt->pad = pad->index;
|
fmt->pad = pad->index;
|
||||||
return v4l2_subdev_call(media_entity_to_v4l2_subdev(
|
return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt);
|
||||||
pad->entity),
|
|
||||||
pad, get_fmt, NULL, fmt);
|
|
||||||
default:
|
|
||||||
WARN(1, "Driver bug! Wrong media entity type %d, entity %s\n",
|
|
||||||
media_entity_type(pad->entity), pad->entity->name);
|
|
||||||
/* Fall through */
|
|
||||||
case MEDIA_ENT_T_DEVNODE_V4L:
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WARN(pad->entity->type != MEDIA_ENT_T_DEVNODE_V4L,
|
||||||
|
"Driver bug! Wrong media entity type 0x%08x, entity %s\n",
|
||||||
|
pad->entity->type, pad->entity->name);
|
||||||
|
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
int v4l2_subdev_link_validate(struct media_link *link)
|
int v4l2_subdev_link_validate(struct media_link *link)
|
||||||
|
|
Loading…
Reference in New Issue