On Tue, Nov 12, 2013 at 07:28:10PM +0900, Kukjin Kim wrote: > Vinod Koul wrote: > > > > On Thu, Oct 31, 2013 at 10:48:09AM +0530, Sachin Kamat wrote: > > > Use the recently introduced DMA_COMPLETE instead of DMA_SUCCESS. > > > Without this patch we get the following build error: > > > drivers/dma/s3c24xx-dma.c: In function ‘s3c24xx_dma_tx_status’: > > > drivers/dma/s3c24xx-dma.c:798:13: error: ‘DMA_SUCCESS’ undeclared > > > (first use in this function) > > I missed it because this is not in my tree! This needs to go thru kgene's > > tree > > and for that you can merge dma_complete branch from my tree. I will not > > rebase > > that > > > > Acked-by: Vinod Koul <[email protected]> > > > > Oops, I missed :( > > Vinod, since the s3c24xx-dma is in Linus' tree now, you can go ahead with my > ack into your fixes. > > If you want me to take this into samsung tree, let me know :-) Okay, I will apply this after merge window
-- ~Vinod > > Thanks, > Kukjin > > > -- > > ~Vinod > > > > > > Signed-off-by: Sachin Kamat <[email protected]> > > > Cc: Heiko Stuebner <[email protected]> > > > Cc: Vinod Koul <[email protected]> > > > --- > > > drivers/dma/s3c24xx-dma.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c > > > index 4cb127978636..085da4fe6613 100644 > > > --- a/drivers/dma/s3c24xx-dma.c > > > +++ b/drivers/dma/s3c24xx-dma.c > > > @@ -795,7 +795,7 @@ static enum dma_status s3c24xx_dma_tx_status(struct > > dma_chan *chan, > > > > > > spin_lock_irqsave(&s3cchan->vc.lock, flags); > > > ret = dma_cookie_status(chan, cookie, txstate); > > > - if (ret == DMA_SUCCESS) { > > > + if (ret == DMA_COMPLETE) { > > > spin_unlock_irqrestore(&s3cchan->vc.lock, flags); > > > return ret; > > > } > > > -- > > > 1.7.9.5 > > > > > > > -- > > -- > To unsubscribe from this list: send the line "unsubscribe dmaengine" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
