[PATCH 6/6] dma/imx-sdma: check whether event_id0 < 32 when set event_mask

[Richard Zhao]

On Tue, Jan 10, 2012 at 10:20:10PM +0800, Shawn Guo wrote:
> On Tue, Jan 10, 2012 at 03:01:50PM +0800, Richard Zhao wrote:
> > Signed-off-by: Richard Zhao <richard.zhao at linaro.org>
> > ---
> 
> I think it deserves a sensible commit message explaining why the patch
> is needed.
If event_id0 < 32, 1 << (sdmac->event_id0 - 32) is not zero.

Thanks
Richard
> 
> Regards,
> Shawn
> 
> >  drivers/dma/imx-sdma.c |    7 +++++--
> >  1 files changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> > index 22fd561..1d5b6ab 100644
> > --- a/drivers/dma/imx-sdma.c
> > +++ b/drivers/dma/imx-sdma.c
> > @@ -753,8 +753,11 @@ static int sdma_config_channel(struct sdma_channel *sdmac)
> >  			if (sdmac->event_id0 > 31)
> >  				sdmac->watermark_level |= 1 << 30;
> >  		} else {
> > -			sdmac->event_mask0 = 1 << sdmac->event_id0;
> > -			sdmac->event_mask1 = 1 << (sdmac->event_id0 - 32);
> > +			if (sdmac->event_id0 < 32)
> > +				sdmac->event_mask0 = 1 << sdmac->event_id0;
> > +			else
> > +				sdmac->event_mask1 =
> > +						1 << (sdmac->event_id0 - 32);
> >  		}
> >  		/* Watermark Level */
> >  		sdmac->watermark_level |= sdmac->watermark_level;
> > -- 
> > 1.7.5.4
> > 
> >