[media] media: davinci: vpbe: fix return value check in vpbe_display_reqbufs()

In case of error, the function vb2_dma_contig_init_ctx() returns
ERR_PTR() and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Prabhakar Lad <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Wei Yongjun 2012-12-02 06:18:35 -03:00 коммит произвёл Mauro Carvalho Chehab
Родитель cfe9dbd8a7
Коммит 4d22f1086d
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -1393,9 +1393,9 @@ static int vpbe_display_reqbufs(struct file *file, void *priv,
} }
/* Initialize videobuf queue as per the buffer type */ /* Initialize videobuf queue as per the buffer type */
layer->alloc_ctx = vb2_dma_contig_init_ctx(vpbe_dev->pdev); layer->alloc_ctx = vb2_dma_contig_init_ctx(vpbe_dev->pdev);
if (!layer->alloc_ctx) { if (IS_ERR(layer->alloc_ctx)) {
v4l2_err(&vpbe_dev->v4l2_dev, "Failed to get the context\n"); v4l2_err(&vpbe_dev->v4l2_dev, "Failed to get the context\n");
return -EINVAL; return PTR_ERR(layer->alloc_ctx);
} }
q = &layer->buffer_queue; q = &layer->buffer_queue;
memset(q, 0, sizeof(*q)); memset(q, 0, sizeof(*q));