Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286131
b: refs/heads/master
c: 4003122
h: refs/heads/master
i:
  286129: c90abb9
  286127: 5302bcc
v: v3
  • Loading branch information
Lothar Waßmann authored and Vinod Koul committed Dec 23, 2011
1 parent 8bf92e8 commit 33658b8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3506c0d507144d9b0f19efd5a56d289f70611179
refs/heads/master: 400312201b0cf4e4deaf75842f5e95212b382e81
2 changes: 1 addition & 1 deletion trunk/drivers/dma/mxs-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down

0 comments on commit 33658b8

Please sign in to comment.