From: Sachin Kamat <sachin.kamat@linaro.org>
To: linux-next@vger.kernel.org
Cc: sachin.kamat@linaro.org, patches@linaro.org,
Inderpal Singh <inderpal.singh@linaro.org>,
Vinod Koul <vinod.koul@linux.intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: [PATCH] DMA: PL330: Fix build error (on linux-next-20120924)
Date: Tue, 25 Sep 2012 09:55:12 +0530 [thread overview]
Message-ID: <CAK9yfHzCCXm4+pWX+Eiv+VGEeZrkSSzshF_LQbsREkK3SbP02g@mail.gmail.com> (raw)
In-Reply-To: <1348546800-15857-1-git-send-email-sachin.kamat@linaro.org>
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
next prev parent reply other threads:[~2012-09-25 4:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 4:20 [PATCH] DMA: PL330: Fix build error (on linux-next-20120924) Sachin Kamat
2012-09-25 4:25 ` Sachin Kamat [this message]
2012-09-26 1:16 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAK9yfHzCCXm4+pWX+Eiv+VGEeZrkSSzshF_LQbsREkK3SbP02g@mail.gmail.com \
--to=sachin.kamat@linaro.org \
--cc=inderpal.singh@linaro.org \
--cc=linux-next@vger.kernel.org \
--cc=patches@linaro.org \
--cc=sfr@canb.auug.org.au \
--cc=vinod.koul@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).