From: Sakari Ailus Date: Mon, 28 Nov 2016 11:48:33 +0000 (-0200) Subject: [media] davinci: Use a local media device pointer instead X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0cffd6312f3fd9e51fec946eb918a988b109b520;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] davinci: Use a local media device pointer instead The function has a local variable that points to the media device; use that instead of finding the media device under the entity. Signed-off-by: Sakari Ailus Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 03269d37a376..8b2117ee0f60 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -145,7 +145,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video) pipe->outputs[pipe->output_num++] = video; mutex_lock(&mdev->graph_mutex); - ret = media_graph_walk_init(&graph, entity->graph_obj.mdev); + ret = media_graph_walk_init(&graph, mdev); if (ret) { mutex_unlock(&mdev->graph_mutex); return -ENOMEM; @@ -300,7 +300,7 @@ static int vpfe_pipeline_enable(struct vpfe_pipeline *pipe) mdev = entity->graph_obj.mdev; mutex_lock(&mdev->graph_mutex); - ret = media_graph_walk_init(&pipe->graph, entity->graph_obj.mdev); + ret = media_graph_walk_init(&pipe->graph, mdev); if (ret) goto out; media_graph_walk_start(&pipe->graph, entity);