From: Javier Martinez Canillas <jav...@osg.samsung.com>
The struct media_entity does not have an .id field anymore since
now the entity ID is stored in the embedded struct media_gobj.
This caused the omap4iss driver fail to build. Fix by using the
media_entity_id() macro to obtain the entity ID.
Signed-off-by: Javier Martinez Canillas <jav...@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mche...@osg.samsung.com>
diff --git a/drivers/staging/media/omap4iss/iss.c
b/drivers/staging/media/omap4iss/iss.c
index 9bfb725b9986..e54a7afd31de 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -607,7 +607,7 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe,
* crashed. Mark it as such, the ISS will be reset when
* applications will release it.
*/
- iss->crashed |= 1U << subdev->entity.id;
+ iss->crashed |= 1U << media_entity_id(&subdev->entity);
failure = -ETIMEDOUT;
}
}
diff --git a/drivers/staging/media/omap4iss/iss_video.c
b/drivers/staging/media/omap4iss/iss_video.c
index bae67742706f..25e9e7a6b99d 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -784,7 +784,7 @@ iss_video_streamon(struct file *file, void *fh, enum
v4l2_buf_type type)
entity = &video->video.entity;
media_entity_graph_walk_start(&graph, entity);
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
* the connected subdev.
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
