From a18f3c47c03646af149a82ac995b5da64ff97007 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 27 Oct 2012 16:22:25 -0300 Subject: [PATCH] --- yaml --- r: 343850 b: refs/heads/master c: 2869a318ce313f97f987935dd225d88a9b30b2fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/m2m-deinterlace.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2d2ed46637cc..d69af73fa411 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83fa235b72cf8b6075032a764e61adf11498006b +refs/heads/master: 2869a318ce313f97f987935dd225d88a9b30b2fc diff --git a/trunk/drivers/media/platform/m2m-deinterlace.c b/trunk/drivers/media/platform/m2m-deinterlace.c index fcdbb2744ebb..05c560f2ef06 100644 --- a/trunk/drivers/media/platform/m2m-deinterlace.c +++ b/trunk/drivers/media/platform/m2m-deinterlace.c @@ -218,15 +218,14 @@ static void dma_callback(void *data) static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op, int do_callback) { - struct deinterlace_q_data *s_q_data, *d_q_data; + struct deinterlace_q_data *s_q_data; struct vb2_buffer *src_buf, *dst_buf; struct deinterlace_dev *pcdev = ctx->dev; struct dma_chan *chan = pcdev->dma_chan; struct dma_device *dmadev = chan->device; struct dma_async_tx_descriptor *tx; unsigned int s_width, s_height; - unsigned int d_width, d_height; - unsigned int d_size, s_size; + unsigned int s_size; dma_addr_t p_in, p_out; enum dma_ctrl_flags flags; @@ -238,11 +237,6 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op, s_height = s_q_data->height; s_size = s_width * s_height; - d_q_data = get_q_data(V4L2_BUF_TYPE_VIDEO_CAPTURE); - d_width = d_q_data->width; - d_height = d_q_data->height; - d_size = d_width * d_height; - p_in = (dma_addr_t)vb2_dma_contig_plane_dma_addr(src_buf, 0); p_out = (dma_addr_t)vb2_dma_contig_plane_dma_addr(dst_buf, 0); if (!p_in || !p_out) {