diff options
| author | Xinyu Chen <b03824@freescale.com> | 2012-02-15 10:35:52 +0800 |
|---|---|---|
| committer | Jeff Kudrick <jeff.kudrick@freescale.com> | 2012-02-28 00:51:51 -0600 |
| commit | 00e38109469396ab8c83dd7e2ef65cbe69d2dbb0 (patch) | |
| tree | a9e70814727a39fe03ae2a254707cd47e5e0b403 | |
| parent | bc461834e7b401628924153a045d1bfea3acd6ee (diff) | |
ENGR00174508 v4l2 capture: fix the dma allocation failed issue
we have already reserved the 8M dummy buffers on v4l2 capture driver probe.
So should not free it when csi encode disable task
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
| -rw-r--r-- | drivers/media/video/mxc/capture/ipu_csi_enc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/video/mxc/capture/ipu_csi_enc.c b/drivers/media/video/mxc/capture/ipu_csi_enc.c index 83a43c5e1a9e..f7c3799400ae 100644 --- a/drivers/media/video/mxc/capture/ipu_csi_enc.c +++ b/drivers/media/video/mxc/capture/ipu_csi_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2009-2012 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -299,13 +299,6 @@ static int csi_enc_disabling_tasks(void *private) ipu_uninit_channel(cam->ipu, CSI_MEM); - if (cam->dummy_frame.vaddress != 0) { - dma_free_coherent(0, cam->dummy_frame.buffer.length, - cam->dummy_frame.vaddress, - cam->dummy_frame.paddress); - cam->dummy_frame.vaddress = 0; - } - #ifdef CONFIG_MXC_MIPI_CSI2 mipi_csi2_info = mipi_csi2_get_info(); |