| Message ID | CAPgLHd-T7M8uuKd3cP31PHM-DfYcPXF_sV3uTQTENqctK6qzfg@mail.gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi, On Sun, Dec 2, 2012 at 3:48 PM, Wei Yongjun <weiyj.lk@gmail.com> wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > 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> Regards, --Prabhakar > --- > drivers/media/platform/davinci/vpbe_display.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c > index 2bfde79..e181a52 100644 > --- a/drivers/media/platform/davinci/vpbe_display.c > +++ b/drivers/media/platform/davinci/vpbe_display.c > @@ -1393,9 +1393,9 @@ static int vpbe_display_reqbufs(struct file *file, void *priv, > } > /* Initialize videobuf queue as per the buffer type */ > 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"); > - return -EINVAL; > + return PTR_ERR(layer->alloc_ctx); > } > q = &layer->buffer_queue; > memset(q, 0, sizeof(*q)); > > _______________________________________________ > Davinci-linux-open-source mailing list > Davinci-linux-open-source@linux.davincidsp.com > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 2bfde79..e181a52 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -1393,9 +1393,9 @@ static int vpbe_display_reqbufs(struct file *file, void *priv, } /* Initialize videobuf queue as per the buffer type */ 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"); - return -EINVAL; + return PTR_ERR(layer->alloc_ctx); } q = &layer->buffer_queue; memset(q, 0, sizeof(*q));