diff --git a/[refs] b/[refs]
index f218686319ea..9887c502adc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b6c710e2a0f636aa038dc80dc114edf8217f5e6
+refs/heads/master: 1b94242a692efa52656c8cb544f5cb87d1b3056f
diff --git a/trunk/drivers/staging/fwserial/dma_fifo.c b/trunk/drivers/staging/fwserial/dma_fifo.c
index 72aa0533f018..5e8463445504 100644
--- a/trunk/drivers/staging/fwserial/dma_fifo.c
+++ b/trunk/drivers/staging/fwserial/dma_fifo.c
@@ -33,10 +33,7 @@
 
 #define FAIL(fifo, condition, format...) ({				\
 	fifo->corrupt = !!(condition);					\
-	if (unlikely(fifo->corrupt)) {					\
-		__WARN_printf(format);					\
-	}								\
-	unlikely(fifo->corrupt);					\
+	WARN(fifo->corrupt, format);					\
 })
 
 /*