From 693077407fc76b48b032781873c4c6b703476516 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 13 Jan 2012 11:10:00 +0800 Subject: [PATCH] --- yaml --- r: 297488 b: refs/heads/master c: b78bd91f47b28ba1290a7eb95d8cf48a357e1b90 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/imx-sdma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 810b47fd9cd1..e8aa4403e674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2c744d3aa48f845626131176772bae2a3c9d5bc +refs/heads/master: b78bd91f47b28ba1290a7eb95d8cf48a357e1b90 diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/drivers/dma/imx-sdma.c index 1e0e516b481f..5eb96b53e6da 100644 --- a/trunk/drivers/dma/imx-sdma.c +++ b/trunk/drivers/dma/imx-sdma.c @@ -723,7 +723,7 @@ static int sdma_config_channel(struct sdma_channel *sdmac) sdmac->per_addr = 0; if (sdmac->event_id0) { - if (sdmac->event_id0 > 32) + if (sdmac->event_id0 >= sdmac->sdma->num_events) return -EINVAL; sdma_event_enable(sdmac, sdmac->event_id0); }