summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
diff options
context:
space:
mode:
authorAlan Cox <alan@llwyncelyn.cymru>2017-05-26 12:29:25 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-06-07 12:44:39 -0300
commit29a323ea90c900aaa9794e567b8d616580ac82ec (patch)
tree0575c85d5698bb086c6d39a0a89b719f25f57e6b /drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
parentb1c056e05b25ba7bf58c9c4f82a767dcfa052f43 (diff)
downloadop-kernel-dev-29a323ea90c900aaa9794e567b8d616580ac82ec.zip
op-kernel-dev-29a323ea90c900aaa9794e567b8d616580ac82ec.tar.gz
[media] atomisp: Unify lut free logic
ISP2401 introduced a helper for this which we can use just as well on the ISP2400 and remove some more noise differences. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c')
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
index 55d2a69..dfef219 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
@@ -2533,15 +2533,8 @@ ia_css_pipe_destroy(struct ia_css_pipe *pipe)
break;
}
-#ifndef ISP2401
- if (pipe->scaler_pp_lut != mmgr_NULL) {
- hmm_free(pipe->scaler_pp_lut);
- pipe->scaler_pp_lut = mmgr_NULL;
- }
-#else
sh_css_params_free_gdc_lut(pipe->scaler_pp_lut);
pipe->scaler_pp_lut = mmgr_NULL;
-#endif
my_css.active_pipes[ia_css_pipe_get_pipe_num(pipe)] = NULL;
sh_css_pipe_free_shading_table(pipe);
OpenPOWER on IntegriCloud