Re: [PATCH] [media] vpif_display: fix return value check in vpif_reqbufs()

2012-11-14 Thread Prabhakar Lad
Hi Wei,

On Mon, Nov 12, 2012 at 2:14 PM, Wei Yongjun weiyj...@gmail.com wrote:
 Hi Prabhakar,

 On 11/09/2012 08:33 PM, Prabhakar Lad wrote:
 Hi Wei,

 Thanks for the patch.

 On Wed, Oct 24, 2012 at 4:59 PM, Wei Yongjun weiyj...@gmail.com wrote:
 From: Wei Yongjun yongjun_...@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().

 dpatch engine is used to auto generate this patch.
 (https://github.com/weiyj/dpatch)

 Signed-off-by: Wei Yongjun yongjun_...@trendmicro.com.cn
 ---
  drivers/media/platform/davinci/vpif_display.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

 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)) {
 Right check would be IS_ERR_OR_NULL(). Can you merge this
 patch 'vpif_capture: fix return value check in vpif_reqbufs()' with
 this one  and post a v2 with above changes ?

 I will merge those two patch into one.
 And I never see vb2_dma_contig_init_ctx() can return NULL as a return
 value, we still would using IS_ERR_OR_NULL()?

IS_ERR() should be Ok.

Regards,
--Prabhakar Lad

 ---
 void *vb2_dma_contig_init_ctx(struct device *dev)
 {
struct vb2_dc_conf *conf;

conf = kzalloc(sizeof *conf, GFP_KERNEL);
if (!conf)
  return ERR_PTR(-ENOMEM);

conf-dev = dev;

return conf;
 }
 ---




--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] [media] vpif_display: fix return value check in vpif_reqbufs()

2012-11-12 Thread Wei Yongjun
Hi Prabhakar,

On 11/09/2012 08:33 PM, Prabhakar Lad wrote:
 Hi Wei,

 Thanks for the patch.

 On Wed, Oct 24, 2012 at 4:59 PM, Wei Yongjun weiyj...@gmail.com wrote:
 From: Wei Yongjun yongjun_...@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().

 dpatch engine is used to auto generate this patch.
 (https://github.com/weiyj/dpatch)

 Signed-off-by: Wei Yongjun yongjun_...@trendmicro.com.cn
 ---
  drivers/media/platform/davinci/vpif_display.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

 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)) {
 Right check would be IS_ERR_OR_NULL(). Can you merge this
 patch 'vpif_capture: fix return value check in vpif_reqbufs()' with
 this one  and post a v2 with above changes ?

I will merge those two patch into one.
And I never see vb2_dma_contig_init_ctx() can return NULL as a return
value, we still would using IS_ERR_OR_NULL()?

---
void *vb2_dma_contig_init_ctx(struct device *dev)
{
   struct vb2_dc_conf *conf;

   conf = kzalloc(sizeof *conf, GFP_KERNEL);
   if (!conf)
 return ERR_PTR(-ENOMEM);
 
   conf-dev = dev;
 
   return conf;
}
---




--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] [media] vpif_display: fix return value check in vpif_reqbufs()

2012-11-09 Thread Prabhakar Lad
Hi Wei,

Thanks for the patch.

On Wed, Oct 24, 2012 at 4:59 PM, Wei Yongjun weiyj...@gmail.com wrote:
 From: Wei Yongjun yongjun_...@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().

 dpatch engine is used to auto generate this patch.
 (https://github.com/weiyj/dpatch)

 Signed-off-by: Wei Yongjun yongjun_...@trendmicro.com.cn
 ---
  drivers/media/platform/davinci/vpif_display.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

 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)) {

Right check would be IS_ERR_OR_NULL(). Can you merge this
patch 'vpif_capture: fix return value check in vpif_reqbufs()' with
this one  and post a v2 with above changes ?

Regards,
--Prabhakar Lad

 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;

 --
 To unsubscribe from this list: send the line unsubscribe linux-media in
 the body of a message to majord...@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] [media] vpif_display: fix return value check in vpif_reqbufs()

2012-10-24 Thread Wei Yongjun
From: Wei Yongjun yongjun_...@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().

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun yongjun_...@trendmicro.com.cn
---
 drivers/media/platform/davinci/vpif_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html