]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
media: xilinx: Reordered mutexes initialization
authorRadhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Mon, 26 May 2014 11:32:43 +0000 (17:02 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 27 May 2014 11:28:25 +0000 (13:28 +0200)
Reordered mutexes initialization so that there is no
need of destroying mutex incase media_entity_init()
fails.

Signed-off-by: Radhey Shyam Pandey <radheys@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/media/platform/xilinx/xilinx-dma.c

index f7c379fc9ce646cac673eb415d18e219531a74d2..8e49ef2076667cd7dbca700018cca1aa1efb20ea 100644 (file)
@@ -905,8 +905,6 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
 
        dma->xdev = xdev;
        dma->port = port;
-       mutex_init(&dma->lock);
-       mutex_init(&dma->pipe.lock);
 
        dma->fmtinfo = xvip_get_format_by_fourcc(XVIP_DMA_DEF_FORMAT);
        dma->format.pixelformat = dma->fmtinfo->fourcc;
@@ -925,6 +923,8 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
        if (ret < 0)
                return ret;
 
+       mutex_init(&dma->lock);
+       mutex_init(&dma->pipe.lock);
        /* ... and the video node... */
        dma->video.v4l2_dev = &xdev->v4l2_dev;
        dma->video.fops = &xvip_dma_fops;