diff options
| author |   Fabio Estevam <fabio.estevam@freescale.com> | 2015-08-10 14:11:41 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-08-19 07:04:55 -0300 |
| commit | 02387b5f25bdba668c7fe2618697bae24f973667 (patch) | |
| tree | b1eaac45b20e76cf8d1b0714df25a1f48f91ae43 /drivers/media/pci/mantis/mantis_dma.c | |
| parent | Revert "[media] rc: rc-ir-raw: Add scancode encoder callback" (diff) | |
| download | linux-dev-02387b5f25bdba668c7fe2618697bae24f973667.tar.xz linux-dev-02387b5f25bdba668c7fe2618697bae24f973667.zip | |
[media] mantis: Fix error handling in mantis_dma_init()
Current code assigns 0 to variable 'err', which makes mantis_dma_init()
to return success even if mantis_alloc_buffers() fails.
Fix it by checking the return value from mantis_alloc_buffers() and
propagating it in the case of error.
Reported-by: RUC_Soft_Sec <zy900702@163.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/media/pci/mantis/mantis_dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/pci/mantis/mantis_dma.c b/drivers/media/pci/mantis/mantis_dma.c index 1d59c7e039f7..87990ece5848 100644 --- a/drivers/media/pci/mantis/mantis_dma.c +++ b/drivers/media/pci/mantis/mantis_dma.c @@ -130,10 +130,11 @@ err: int mantis_dma_init(struct mantis_pci *mantis) { - int err = 0; + int err; dprintk(MANTIS_DEBUG, 1, "Mantis DMA init"); - if (mantis_alloc_buffers(mantis) < 0) { + err = mantis_alloc_buffers(mantis); + if (err < 0) { dprintk(MANTIS_ERROR, 1, "Error allocating DMA buffer"); /* Stop RISC Engine */ |