]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] s5p-mfc: Correct check of vb2_dma_contig_init_ctx return value
authorKamil Debski <k.debski@samsung.com>
Thu, 3 Jan 2013 10:06:03 +0000 (07:06 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 6 Jan 2013 11:58:24 +0000 (09:58 -0200)
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>
drivers/media/platform/s5p-mfc/s5p_mfc.c

index 9a679fab73e235dcff390b3b70666ed126de01d7..4fcd075e86991ce8abe3aaf12268c027739db72d 100644 (file)
@@ -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;
        }