diff options
| author | Mauro Carvalho Chehab | 2018-03-26 21:27:54 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-04-04 13:36:28 +0200 |
| commit | 83d019bbb0ed214b4ab9d43107cb2fd7be5aeeea (patch) | |
| tree | bd5a6918175fe4e7d7646ca343c7667189f69752 | |
| parent | media: staging: atomisp: avoid a warning if 32 bits build (diff) | |
| download | kernel-qcow2-linux-83d019bbb0ed214b4ab9d43107cb2fd7be5aeeea.tar.gz kernel-qcow2-linux-83d019bbb0ed214b4ab9d43107cb2fd7be5aeeea.tar.xz kernel-qcow2-linux-83d019bbb0ed214b4ab9d43107cb2fd7be5aeeea.zip | |
media: staging: atomisp: remove an useless check
There's a check at ia_css_vf_configure() to verify if
binary is not null. However, this is called too late:
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c:133 ia_css_vf_configure() warn: variable dereferenced before check 'binary' (see line 129)
This test is wrong, as this fuction is only called by
ia_css_binary_fill_info(), in a place that already assumes that
binary is not null, and checks with:
assert(binary != NULL);
So, remove the useless broken extra check.
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c index 5610833ed595..c2076e412410 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c @@ -130,11 +130,11 @@ ia_css_vf_configure( err = configure_kernel(info, out_info, vf_info, downscale_log2, &config); configure_dma(&config, vf_info); - if (binary) { - if (vf_info) - vf_info->raw_bit_depth = info->dma.vfdec_bits_per_pixel; - ia_css_configure_vf (binary, &config); - } + + if (vf_info) + vf_info->raw_bit_depth = info->dma.vfdec_bits_per_pixel; + ia_css_configure_vf (binary, &config); + return IA_CSS_SUCCESS; } |