diff options
| author | Kamil Debski | 2013-01-03 11:06:03 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-01-06 12:58:24 +0100 |
| commit | ef89fff874758c0f08501bdc2932b7e77421cfc6 (patch) | |
| tree | 893197969ec65aa1ce2907b225d74bd448fecea7 /drivers/media/platform/s5p-mfc/s5p_mfc.c | |
| parent | [media] s5p-mfc: Move firmware allocation point to avoid allocation problems (diff) | |
| download | kernel-qcow2-linux-ef89fff874758c0f08501bdc2932b7e77421cfc6.tar.gz kernel-qcow2-linux-ef89fff874758c0f08501bdc2932b7e77421cfc6.tar.xz kernel-qcow2-linux-ef89fff874758c0f08501bdc2932b7e77421cfc6.zip | |
[media] s5p-mfc: Correct check of vb2_dma_contig_init_ctx return value
vb2_dma_contig_init_ctx returns an error if failed, NULL check is not necessary.
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc.c')
| -rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 9a679fab73e2..4fcd075e8699 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1135,12 +1135,12 @@ static int s5p_mfc_probe(struct platform_device *pdev) } dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l); - if (IS_ERR_OR_NULL(dev->alloc_ctx[0])) { + if (IS_ERR(dev->alloc_ctx[0])) { ret = PTR_ERR(dev->alloc_ctx[0]); goto err_res; } dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r); - if (IS_ERR_OR_NULL(dev->alloc_ctx[1])) { + if (IS_ERR(dev->alloc_ctx[1])) { ret = PTR_ERR(dev->alloc_ctx[1]); goto err_mem_init_ctx_1; } |