From 33658b821a72d161ef7032ad782a39fd21945479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 8 Dec 2011 09:15:41 +0100 Subject: [PATCH] --- yaml --- r: 286131 b: refs/heads/master c: 400312201b0cf4e4deaf75842f5e95212b382e81 h: refs/heads/master i: 286129: c90abb987017ab26c1275f8d17b9aeb747e22714 286127: 5302bcc299e0a64b2c62b45454a5d0ed5cf56e41 v: v3 --- [refs] | 2 +- trunk/drivers/dma/mxs-dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c13b9d66412..de37d8fa23fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3506c0d507144d9b0f19efd5a56d289f70611179 +refs/heads/master: 400312201b0cf4e4deaf75842f5e95212b382e81 diff --git a/trunk/drivers/dma/mxs-dma.c b/trunk/drivers/dma/mxs-dma.c index bdf4672b2553..d04662e94467 100644 --- a/trunk/drivers/dma/mxs-dma.c +++ b/trunk/drivers/dma/mxs-dma.c @@ -268,7 +268,7 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id) /* * When both completion and error of termination bits set at the * same time, we do not take it as an error. IOW, it only becomes - * an error we need to handler here in case of ether it's (1) an bus + * an error we need to handle here in case of either it's (1) a bus * error or (2) a termination error with no completion. */ stat2 = ((stat2 >> MXS_DMA_CHANNELS) & stat2) | /* (1) */