From f8736a74a357ae3f8a8af2f6eb6e9dd40ab5e34d Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 18 Oct 2012 17:34:11 +0300 Subject: [PATCH] --- yaml --- r: 358471 b: refs/heads/master c: ba84bd7146b9244de0ce04cdc668521a73f5336f h: refs/heads/master i: 358469: 0b2859ac52fc7602d1ed27b1f4ef27b10ffafce7 358467: 3bf299cb933af148607d30e5acb5b8f4d534c047 358463: b2d6f93cb1640e604f0af8e1b292170ec9604a65 v: v3 --- [refs] | 2 +- trunk/drivers/dma/dw_dmac.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e48dd7d229ab..7cf66004b93a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6168d5670bd764557b5e06b1842964a44cf34a45 +refs/heads/master: ba84bd7146b9244de0ce04cdc668521a73f5336f diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c index d60ef9c7dd68..9a27fb70c950 100644 --- a/trunk/drivers/dma/dw_dmac.c +++ b/trunk/drivers/dma/dw_dmac.c @@ -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);