Re: [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority aftersdma_request_channel

[Richard Zhao]

To avoid merge conflicts, I'll send the patch series again with
other prior sdma patch.

Thanks
Richard

On Tue, Jan 10, 2012 at 11:02:25AM +0800, Shawn Guo wrote:
> On Mon, Jan 09, 2012 at 04:48:59PM +0800, Richard Zhao wrote:
> > sdma_request_channel sets the default priority. sdma_alloc_chan_resources
> > should call sdma_set_channel_priority thereafter to over write it.
> > 
> > Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxx>
> 
> Acked-by: Shawn Guo <shawn.guo@xxxxxxxxxx>
> 
> Regards,
> Shawn
> 
> > ---
> >  drivers/dma/imx-sdma.c |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> > index 2cc96c4..6376009 100644
> > --- a/drivers/dma/imx-sdma.c
> > +++ b/drivers/dma/imx-sdma.c
> > @@ -875,11 +875,11 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
> >  
> >  	sdmac->peripheral_type = data->peripheral_type;
> >  	sdmac->event_id0 = data->dma_request;
> > -	ret = sdma_set_channel_priority(sdmac, prio);
> > +	ret = sdma_request_channel(sdmac);
> >  	if (ret)
> >  		return ret;
> >  
> > -	ret = sdma_request_channel(sdmac);
> > +	ret = sdma_set_channel_priority(sdmac, prio);
> >  	if (ret)
> >  		return ret;
> >  
> > -- 
> > 1.7.5.4
> > 
> > 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/