[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20121026114533.GA2710@beef>
Date: Fri, 26 Oct 2012 07:45:33 -0400
From: Matt Porter <mporter@...com>
To: Sekhar Nori <nsekhar@...com>
Cc: Cyril Chemparathy <cyril@...com>, khilman@...com,
davinci-linux-open-source@...ux.davincidsp.com,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH] davinci: check for presence of channel controller on
slot alloc
On Fri, Oct 26, 2012 at 05:09:17PM +0530, Sekhar Nori wrote:
> + Matt, who is doing the DMA engine conversion for EDMA
>
> On 9/12/2012 11:44 PM, Cyril Chemparathy wrote:
> > This patch adds a check for the presence of the channel controller when
> > trying to allocate a slot. Without this fix, the kernel panics with a NULL
> > pointer dereference when the dma-engine drivers are probed.
> >
> > Signed-off-by: Cyril Chemparathy <cyril@...com>
> > ---
> > arch/arm/mach-davinci/dma.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
> > index a685e97..2fee31e 100644
> > --- a/arch/arm/mach-davinci/dma.c
> > +++ b/arch/arm/mach-davinci/dma.c
> > @@ -743,6 +743,9 @@ EXPORT_SYMBOL(edma_free_channel);
> > */
> > int edma_alloc_slot(unsigned ctlr, int slot)
> > {
> > + if (!edma_cc[ctlr])
> > + return -ENODEV;
>
> I am ok with this patch, although I wonder if a better error is -ENXIO
> or even -EINVAL (since its most likely the result of a wrong argument).
>
> This patch will conflict with the EDMA movement series that Matt is
> doing and he should probably include it in his series to avoid
> conflicts. From the description it appears to be not required for v3.7
> anyway.
I'll add this to the am33xx dmaengine series with -EINVAL, thanks.
-Matt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists