[PATCH] DMA: PL330: Fix build error (on linux-next-20120924)

[PATCH] DMA: PL330: Fix build error (on linux-next-20120924)

[Sachin Kamat]

Auto resolution of merge conflict between commits 61c6e753 (DMA: PL330:
Check the pointer returned by kzalloc) from Linus tree and 7c71b8eb
(DMA: PL330: Remove redundant runtime_suspend/resume functions) from slave-dma
tree probably led to this build error.

drivers/dma/pl330.c: In function ‘pl330_probe’:
drivers/dma/pl330.c:2921:3: error: label ‘probe_err5’ used but not defined

Cc: Inderpal Singh <inderpal.singh@linaro.org>
Cc: Vinod Koul <vinod.koul@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/dma/pl330.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index dcb88b0..13cc576 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2918,7 +2918,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 	if (!pdmac->peripherals) {
 		ret = -ENOMEM;
 		dev_err(&adev->dev, "unable to allocate pdmac->peripherals\n");
-		goto probe_err5;
+		goto probe_err4;
 	}
 
 	for (i = 0; i < num_chan; i++) {
-- 
1.7.4.1

Re: [PATCH] DMA: PL330: Fix build error (on linux-next-20120924)

[Sachin Kamat]

Compile tested using exynos4_defconfig.

On 25 September 2012 09:50, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Auto resolution of merge conflict between commits 61c6e753 (DMA: PL330:
> Check the pointer returned by kzalloc) from Linus tree and 7c71b8eb
> (DMA: PL330: Remove redundant runtime_suspend/resume functions) from slave-dma
> tree probably led to this build error.
>
> drivers/dma/pl330.c: In function ‘pl330_probe’:
> drivers/dma/pl330.c:2921:3: error: label ‘probe_err5’ used but not defined
>
> Cc: Inderpal Singh <inderpal.singh@linaro.org>
> Cc: Vinod Koul <vinod.koul@linux.intel.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/dma/pl330.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> index dcb88b0..13cc576 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -2918,7 +2918,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
>         if (!pdmac->peripherals) {
>                 ret = -ENOMEM;
>                 dev_err(&adev->dev, "unable to allocate pdmac->peripherals\n");
> -               goto probe_err5;
> +               goto probe_err4;
>         }
>
>         for (i = 0; i < num_chan; i++) {
> --
> 1.7.4.1
>



-- 
With warm regards,
Sachin

Re: [PATCH] DMA: PL330: Fix build error (on linux-next-20120924)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1049 bytes --]

Hi Sachin,

On Tue, 25 Sep 2012 09:50:00 +0530 Sachin Kamat <sachin.kamat@linaro.org> wrote:
>
> Auto resolution of merge conflict between commits 61c6e753 (DMA: PL330:
> Check the pointer returned by kzalloc) from Linus tree and 7c71b8eb
> (DMA: PL330: Remove redundant runtime_suspend/resume functions) from slave-dma
> tree probably led to this build error.
> 
> drivers/dma/pl330.c: In function ‘pl330_probe’:
> drivers/dma/pl330.c:2921:3: error: label ‘probe_err5’ used but not defined
> 
> Cc: Inderpal Singh <inderpal.singh@linaro.org>
> Cc: Vinod Koul <vinod.koul@linux.intel.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

I have added this as a merge fix from today.

Vinod:

Please remember to let Linus know when you ask him to merge the slave-dma
tree during the merge window (or do a commented back merge of the
appropriate part of Linus' tree and fix it before then).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]