Compile tested using exynos4_defconfig.
On 25 September 2012 09:50, Sachin Kamat <sachin.kamat@xxxxxxxxxx> 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@xxxxxxxxxx>
> Cc: Vinod Koul <vinod.koul@xxxxxxxxxxxxxxx>
> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
