Commit 1302d39c authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab

[media] staging: omap4iss: get entity ID using media_entity_id()

Accessing media_entity ID should now use media_entity_id() macro to
obtain the entity ID, as a next patch will remove the .id field from
struct media_entity .

So, get rid of it, otherwise the omap4iss driver will fail to build.
Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent fa762394
...@@ -607,7 +607,7 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe, ...@@ -607,7 +607,7 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe,
* crashed. Mark it as such, the ISS will be reset when * crashed. Mark it as such, the ISS will be reset when
* applications will release it. * applications will release it.
*/ */
iss->crashed |= 1U << subdev->entity.id; iss->crashed |= 1U << media_entity_id(&subdev->entity);
failure = -ETIMEDOUT; failure = -ETIMEDOUT;
} }
} }
......
...@@ -782,7 +782,7 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) ...@@ -782,7 +782,7 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
entity = &video->video.entity; entity = &video->video.entity;
media_entity_graph_walk_start(&graph, entity); media_entity_graph_walk_start(&graph, entity);
while ((entity = media_entity_graph_walk_next(&graph))) while ((entity = media_entity_graph_walk_next(&graph)))
pipe->entities |= 1 << entity->id; pipe->entities |= 1 << media_entity_id(entity);
/* Verify that the currently configured format matches the output of /* Verify that the currently configured format matches the output of
* the connected subdev. * the connected subdev.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment