Hi Wei,
On Thu, Nov 15, 2012 at 6:48 PM, Wei Yongjun <[email protected]> wrote:
> From: Wei Yongjun <[email protected]>
>
> 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().
>
> dpatch engine is used to auto generate this patch.
> (https://github.com/weiyj/dpatch)
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/media/platform/davinci/vpif_display.c | 4 ++--
> drivers/media/platform/davinci/vpif_capture.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
Applied to my tree with following change in commit header,
'davinci: vpif: fix return value check for vb2_dma_contig_init_ctx()'
Regards,
--Prabhakar Lad
> diff --git a/drivers/media/platform/davinci/vpif_display.c
> b/drivers/media/platform/davinci/vpif_display.c
> index b716fbd..5453bbb 100644
> --- a/drivers/media/platform/davinci/vpif_display.c
> +++ b/drivers/media/platform/davinci/vpif_display.c
> @@ -972,9 +972,9 @@ static int vpif_reqbufs(struct file *file, void *priv,
> }
> /* Initialize videobuf2 queue as per the buffer type */
> common->alloc_ctx = vb2_dma_contig_init_ctx(vpif_dev);
> - if (!common->alloc_ctx) {
> + if (IS_ERR(common->alloc_ctx)) {
> vpif_err("Failed to get the context\n");
> - return -EINVAL;
> + return PTR_ERR(common->alloc_ctx);
> }
> q = &common->buffer_queue;
> q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
>
> diff --git a/drivers/media/platform/davinci/vpif_capture.c
> b/drivers/media/platform/davinci/vpif_capture.c
> index fcabc02..9746324 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -1004,9 +1004,9 @@ static int vpif_reqbufs(struct file *file, void *priv,
>
> /* Initialize videobuf2 queue as per the buffer type */
> common->alloc_ctx = vb2_dma_contig_init_ctx(vpif_dev);
> - if (!common->alloc_ctx) {
> + if (IS_ERR(common->alloc_ctx)) {
> vpif_err("Failed to get the context\n");
> - return -EINVAL;
> + return PTR_ERR(common->alloc_ctx);
> }
> q = &common->buffer_queue;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
