On Sun, Aug 23, 2015 at 2:17 PM, Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> wrote: > From: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx> > > 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 <javier@xxxxxxxxxxxxxxx> > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> > > 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); > Looks good to me. Acked-by: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx> thanks, -- Shuah -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
