diff mbox

[-next,media] davinci: vpif_display: fix error return code in vpif_probe()

Message ID CAPgLHd89o=SNERB1cCyQKUmyQE9q-hx6nj19yvVd_PzkOfp4BA@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Yongjun Aug. 23, 2013, 2:59 a.m. UTC
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Fix to return -ENODEV in the subdevice register error handling
case instead of 0, as done elsewhere in this function.

Introduce by commit 4b8a531e6bb0686203e9cf82a54dfe189de7d5c2.
([media] media: davinci: vpif: display: add V4L2-async support)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/media/platform/davinci/vpif_display.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Prabhakar Aug. 23, 2013, 3:09 a.m. UTC | #1
Hi Wei,

On Fri, Aug 23, 2013 at 8:29 AM, Wei Yongjun <weiyj.lk@gmail.com> wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Fix to return -ENODEV in the subdevice register error handling
> case instead of 0, as done elsewhere in this function.
>
> Introduce by commit 4b8a531e6bb0686203e9cf82a54dfe189de7d5c2.
> ([media] media: davinci: vpif: display: add V4L2-async support)
>
This fix is already present in the kernel with commit id
4fa94e224b84be7b2522a0f5ce5b64124f146fac

Regards,
--Prabhakar Lad
Prabhakar Aug. 23, 2013, 3:13 a.m. UTC | #2
Hi Wei

On Fri, Aug 23, 2013 at 8:39 AM, Prabhakar Lad
<prabhakar.csengg@gmail.com> wrote:
> Hi Wei,
>
> On Fri, Aug 23, 2013 at 8:29 AM, Wei Yongjun <weiyj.lk@gmail.com> wrote:
>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>>
>> Fix to return -ENODEV in the subdevice register error handling
>> case instead of 0, as done elsewhere in this function.
>>
>> Introduce by commit 4b8a531e6bb0686203e9cf82a54dfe189de7d5c2.
>> ([media] media: davinci: vpif: display: add V4L2-async support)
>>
> This fix is already present in the kernel with commit id
> 4fa94e224b84be7b2522a0f5ce5b64124f146fac
>
OOps my bad, I over looked it.

Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>

Regards,
--Prabhakar Lad
yongjun_wei@trendmicro.com.cn Aug. 23, 2013, 3:39 a.m. UTC | #3
-----Original Message-----
From: Prabhakar Lad [mailto:prabhakar.csengg@gmail.com] 

Sent: 2013?8?23? 11:10
To: Wei Yongjun
Cc: Mauro Carvalho Chehab; Yongjun Wei (RD-CN); linux-media; dlos
Subject: Re: [PATCH -next] [media] davinci: vpif_display: fix error return code in vpif_probe()

Hi Wei,

On Fri, Aug 23, 2013 at 8:29 AM, Wei Yongjun <weiyj.lk@gmail.com> wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

>

> Fix to return -ENODEV in the subdevice register error handling case 

> instead of 0, as done elsewhere in this function.

>

> Introduce by commit 4b8a531e6bb0686203e9cf82a54dfe189de7d5c2.

> ([media] media: davinci: vpif: display: add V4L2-async support)

>

This fix is already present in the kernel with commit id 4fa94e224b84be7b2522a0f5ce5b64124f146fac

Yes, I fix this before, but commit 4b8a531e6bb0686203e9cf82a54dfe189de7d5c2 reverted this fix.

Regards,
--Prabhakar Lad

<table class="TM_EMAIL_NOTICE"><tr><td><pre>
TREND MICRO EMAIL NOTICE
The information contained in this email and any attachments is confidential 
and may be subject to copyright or other intellectual property protection. 
If you are not the intended recipient, you are not authorized to use or 
disclose this information, and we request that you notify us by reply mail or
telephone and delete the original message from your mail system.
</pre></td></tr></table>
diff mbox

Patch

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 6336dfc..0e03b9a 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1824,6 +1824,7 @@  static __init int vpif_probe(struct platform_device *pdev)
 							  NULL);
 			if (!vpif_obj.sd[i]) {
 				vpif_err("Error registering v4l2 subdevice\n");
+				err = -ENODEV;
 				goto probe_subdev_out;
 			}