diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c
index 3c8b32a..89bff46 100644
--- a/drivers/dma/ioat/dma_v2.c
+++ b/drivers/dma/ioat/dma_v2.c
@@ -285,9 +285,9 @@ void ioat2_timer_event(unsigned long data)
 			u32 chanerr;
 
 			chanerr = readl(chan->reg_base + IOAT_CHANERR_OFFSET);
-			dev_err(to_dev(chan), "%s: Channel halted (%x)\n",
-				__func__, chanerr);
-			BUG_ON(is_ioat_bug(chanerr));
+			WARN_ONCE(is_ioat_bug(chanerr), "%s: %s: Channel halted (%x)\n",
+                             dev_name(to_dev(chan)), __func__, chanerr);
+			return;
 		}
 
 		/* if we haven't made progress and we have already