From: Vinod Koul <vinod.koul@intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Dan Williams <dan.j.williams@intel.com>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
Alban Bedel <alban.bedel@avionic-design.de>,
Tomasz Figa <tomasz.figa@gmail.com>
Subject: Re: [PATCH 1/2] dma: pl08x: fix descriptor unmapping
Date: Wed, 18 Dec 2013 21:54:46 +0530 [thread overview]
Message-ID: <20131218162446.GL16227@intel.com> (raw)
In-Reply-To: <20131218162036.GK16227@intel.com>
On Wed, Dec 18, 2013 at 09:50:36PM +0530, Vinod Koul wrote:
> On Sat, Dec 14, 2013 at 12:16:07AM +0100, Linus Walleij wrote:
> > The descriptor unmapping code introduced in commit
> > d38a8c622a1b3 "dmaengine: prepare for generic 'unmap' data"
> > accidentally affects a local struct rather than the
> > async TX descriptor, resulting in this compile error:
> >
> > CC drivers/dma/amba-pl08x.o
> > drivers/dma/amba-pl08x.c: In function ‘pl08x_desc_free’:
> > drivers/dma/amba-pl08x.c:1172:2: warning: passing argument 1 of
> > ‘dma_descriptor_unmap’ from incompatible pointer type [enabled by default]
> > In file included from linux/include/linux/amba/pl08x.h:21:0,
> > from linux/drivers/dma/amba-pl08x.c:79:
> > linux/include/linux/dmaengine.h:476:20: note: expected
> > ‘struct dma_async_tx_descriptor *’ but argument is of type ‘struct pl08x_txd *’
> >
> > Cc: stable@vger.kernel.org
> I am going to apply this and send thru fixes. But I dont think stable tag is apt
> here. IIRC d38a8c622a1b3 was merged in last merge window, so as long this gets
> sent in current -rc's we should be fine
And this was fixes by 89116bf9 - Fix pl08x warnings, and this is in Linus's
tree. So no action here!
--
~Vinod
>
> Dropping stable, pls do yell if you feel otherwise.
>
> --
> ~Vinod
> > Cc: Dan Williams <dan.j.williams@intel.com>
> > Cc: Alban Bedel <alban.bedel@avionic-design.de>
> > Cc: Tomasz Figa <tomasz.figa@gmail.com>
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > ---
> > drivers/dma/amba-pl08x.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
> > index 16a2aa28f856..ec4ee5c1fe9d 100644
> > --- a/drivers/dma/amba-pl08x.c
> > +++ b/drivers/dma/amba-pl08x.c
> > @@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd)
> > struct pl08x_txd *txd = to_pl08x_txd(&vd->tx);
> > struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan);
> >
> > - dma_descriptor_unmap(txd);
> > + dma_descriptor_unmap(&vd->tx);
> > if (!txd->done)
> > pl08x_release_mux(plchan);
> >
> > --
> > 1.8.3.1
> >
>
> --
--
prev parent reply other threads:[~2013-12-18 16:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-13 23:16 [PATCH 1/2] dma: pl08x: fix descriptor unmapping Linus Walleij
2013-12-18 16:20 ` Vinod Koul
2013-12-18 16:24 ` Vinod Koul [this message]
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=20131218162446.GL16227@intel.com \
--to=vinod.koul@intel.com \
--cc=alban.bedel@avionic-design.de \
--cc=dan.j.williams@intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tomasz.figa@gmail.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).