]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
[media] davinci: Use a local media device pointer instead
authorSakari Ailus <sakari.ailus@linux.intel.com>
Mon, 28 Nov 2016 11:48:33 +0000 (09:48 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 30 Jan 2017 13:36:40 +0000 (11:36 -0200)
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 <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/staging/media/davinci_vpfe/vpfe_video.c

index 03269d37a376225e7e2e799fa15f882d61ab1e8e..8b2117ee0f602b43826aabd75e532df4606ecc88 100644 (file)
@@ -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);