diff options
Diffstat (limited to 'drivers/media/platform/xilinx/xilinx-dma.c')
| -rw-r--r-- | drivers/media/platform/xilinx/xilinx-dma.c | 11 | 
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c index 2d1ef7a25c33..0a7fd8642a65 100644 --- a/drivers/media/platform/xilinx/xilinx-dma.c +++ b/drivers/media/platform/xilinx/xilinx-dma.c @@ -402,10 +402,9 @@ static int xvip_dma_start_streaming(struct vb2_queue *vq, unsigned int count)  	 * Use the pipeline object embedded in the first DMA object that starts  	 * streaming.  	 */ -	pipe = dma->video.entity.pipe -	     ? to_xvip_pipeline(&dma->video.entity) : &dma->pipe; +	pipe = to_xvip_pipeline(&dma->video) ? : &dma->pipe; -	ret = media_pipeline_start(&dma->video.entity, &pipe->pipe); +	ret = video_device_pipeline_start(&dma->video, &pipe->pipe);  	if (ret < 0)  		goto error; @@ -431,7 +430,7 @@ static int xvip_dma_start_streaming(struct vb2_queue *vq, unsigned int count)  	return 0;  error_stop: -	media_pipeline_stop(&dma->video.entity); +	video_device_pipeline_stop(&dma->video);  error:  	/* Give back all queued buffers to videobuf2. */ @@ -448,7 +447,7 @@ error:  static void xvip_dma_stop_streaming(struct vb2_queue *vq)  {  	struct xvip_dma *dma = vb2_get_drv_priv(vq); -	struct xvip_pipeline *pipe = to_xvip_pipeline(&dma->video.entity); +	struct xvip_pipeline *pipe = to_xvip_pipeline(&dma->video);  	struct xvip_dma_buffer *buf, *nbuf;  	/* Stop the pipeline. */ @@ -459,7 +458,7 @@ static void xvip_dma_stop_streaming(struct vb2_queue *vq)  	/* Cleanup the pipeline and mark it as being stopped. */  	xvip_pipeline_cleanup(pipe); -	media_pipeline_stop(&dma->video.entity); +	video_device_pipeline_stop(&dma->video);  	/* Give back all queued buffers to videobuf2. */  	spin_lock_irq(&dma->queued_lock);  |