Re: [PATCH] DMA: shdma: fix a bad merge - remove free_irq()

Vinod Koul
2013-08-27T09:46:12Z

On Tue, Aug 27, 2013 at 11:21:00AM +0200, Guennadi Liakhovetski wrote:
> Hi Vinod,
>
> On Mon, 26 Aug 2013, Vinod Koul wrote:
>
> > On Mon, Aug 26, 2013 at 02:27:51PM +0200, Guennadi Liakhovetski wrote:
> > > A bad merge resulted in a left-over free_irq() call. This patch removes it.
> > Applied, thanks
> >
> > Can you also test this branch and see if anything is remaining
> >
> > And can you take care then ARM patches in last serries are merged this week...
>
> Ok, I wanted to just test -next, but the latest is still of 22 Aug and
> that's too old. So, I took the current sh-mobile tree and merged your
> tree on top. There was 1 merge conflict in arch/arm/Makefile, but that's
> unrelated. After doing that I've discovered the following problems:
>
> 1. you applied a wrong version (v1) of my patch "DMA: shdma: support the
> new CHCLR register layout" - not v2, whose patchwork ID I provided:
>
> > DMA: shdma: support the new CHCLR register layout
> > pw ID: 2825593
I have redone the topic branch picking the v2 patch

> I suggest to revert that commit and apply the correct one.
>
> 2. you missed this patch:
>
> > DMA: shdma: move two macros to a header
> > pw ID: 2831934
>
> Please, pick it up too, even though it's just a cosmetic one.
I ahve fixed that up in merge, pls verfiy. So need need of update patch which
you sent..

~Vinod