2013-05-10 04:49:18

by Lad, Prabhakar

Subject: [PATCH] davinci: vpfe: fix error path in probe

From: Lad, Prabhakar <[email protected]>

The error path on failure was calling mutex_unlock(), but there was
no actuall call before for mutex_lock(). This patch fixes this issue
by pointing it to proper go label.

Reported-by: Jose Pablo Carballo <[email protected]>
Signed-off-by: Lad, Prabhakar <[email protected]>
---
drivers/media/platform/davinci/vpfe_capture.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 8c50d30..3827fe1 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -1837,7 +1837,7 @@ static int vpfe_probe(struct platform_device *pdev)
if (NULL == ccdc_cfg) {
v4l2_err(pdev->dev.driver,
"Memory allocation failed for ccdc_cfg\n");
- goto probe_free_lock;
+ goto probe_free_dev_mem;
}

mutex_lock(&ccdc_lock);
--
1.7.4.1

2013-05-10 11:01:32

by Lad, Prabhakar

Subject: Re: [PATCH] davinci: vpfe: fix error path in probe

Hi Hans,

On Fri, May 10, 2013 at 4:25 PM, Hans Verkuil <[email protected]> wrote:
> On Fri May 10 2013 06:48:38 Lad Prabhakar wrote:
>> From: Lad, Prabhakar <[email protected]>
[Snip]
>>
>
> Just FYI:
>
> After applying this patch I get a compiler warning that the probe_free_lock
> label is unused. I've added a patch removing that label.
>
Thanks for fixing it :)

Regards,
--Prabhakar

2013-05-10 11:02:33

by Hans Verkuil

Subject: Re: [PATCH] davinci: vpfe: fix error path in probe

On Fri May 10 2013 06:48:38 Lad Prabhakar wrote:
> From: Lad, Prabhakar <[email protected]>
>
> The error path on failure was calling mutex_unlock(), but there was
> no actuall call before for mutex_lock(). This patch fixes this issue
> by pointing it to proper go label.
>
> Reported-by: Jose Pablo Carballo <[email protected]>
> Signed-off-by: Lad, Prabhakar <[email protected]>
> ---
> drivers/media/platform/davinci/vpfe_capture.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
> index 8c50d30..3827fe1 100644
> --- a/drivers/media/platform/davinci/vpfe_capture.c
> +++ b/drivers/media/platform/davinci/vpfe_capture.c
> @@ -1837,7 +1837,7 @@ static int vpfe_probe(struct platform_device *pdev)
> if (NULL == ccdc_cfg) {
> v4l2_err(pdev->dev.driver,
> "Memory allocation failed for ccdc_cfg\n");
> - goto probe_free_lock;
> + goto probe_free_dev_mem;
> }
>
> mutex_lock(&ccdc_lock);
>

Just FYI:

After applying this patch I get a compiler warning that the probe_free_lock
label is unused. I've added a patch removing that label.

Regards,

Hans