Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 358471
b: refs/heads/master
c: ba84bd7
h: refs/heads/master
i:
  358469: 0b2859a
  358467: 3bf299c
  358463: b2d6f93
v: v3
  • Loading branch information
Andy Shevchenko authored and Vinod Koul committed Jan 8, 2013
1 parent 42568ce commit f8736a7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 6168d5670bd764557b5e06b1842964a44cf34a45
refs/heads/master: ba84bd7146b9244de0ce04cdc668521a73f5336f
6 changes: 3 additions & 3 deletions trunk/drivers/dma/dw_dmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,14 +485,14 @@ static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc)
dwc_dostart(dwc, dwc_first_active(dwc));

/*
* KERN_CRITICAL may seem harsh, but since this only happens
* WARN may seem harsh, but since this only happens
* when someone submits a bad physical address in a
* descriptor, we should consider ourselves lucky that the
* controller flagged an error instead of scribbling over
* random memory locations.
*/
dev_crit(chan2dev(&dwc->chan), "Bad descriptor submitted for DMA!\n");
dev_crit(chan2dev(&dwc->chan), " cookie: %d\n", bad_desc->txd.cookie);
dev_WARN(chan2dev(&dwc->chan), "Bad descriptor submitted for DMA!\n"
" cookie: %d\n", bad_desc->txd.cookie);
dwc_dump_lli(dwc, &bad_desc->lli);
list_for_each_entry(child, &bad_desc->tx_list, desc_node)
dwc_dump_lli(dwc, &child->lli);
Expand Down

0 comments on commit f8736a7

Please sign in to comment.