diff options
author | Kamil Debski <k.debski@samsung.com> | 2013-01-03 05:06:03 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-06 06:58:24 -0500 |
commit | ef89fff874758c0f08501bdc2932b7e77421cfc6 (patch) | |
tree | 893197969ec65aa1ce2907b225d74bd448fecea7 /drivers/media/platform | |
parent | 2e731e443fcc8e4553201ad0573c1d5571e906ac (diff) |
[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')
-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) | |||
1135 | } | 1135 | } |
1136 | 1136 | ||
1137 | dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l); | 1137 | dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l); |
1138 | if (IS_ERR_OR_NULL(dev->alloc_ctx[0])) { | 1138 | if (IS_ERR(dev->alloc_ctx[0])) { |
1139 | ret = PTR_ERR(dev->alloc_ctx[0]); | 1139 | ret = PTR_ERR(dev->alloc_ctx[0]); |
1140 | goto err_res; | 1140 | goto err_res; |
1141 | } | 1141 | } |
1142 | dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r); | 1142 | dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r); |
1143 | if (IS_ERR_OR_NULL(dev->alloc_ctx[1])) { | 1143 | if (IS_ERR(dev->alloc_ctx[1])) { |
1144 | ret = PTR_ERR(dev->alloc_ctx[1]); | 1144 | ret = PTR_ERR(dev->alloc_ctx[1]); |
1145 | goto err_mem_init_ctx_1; | 1145 | goto err_mem_init_ctx_1; |
1146 | } | 1146 | } |