diff --git a/[refs] b/[refs] index 7baea9a348bb..c5243ba49189 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7355ba3445f2a741bfb9f03c7c8d5fc3e10bf63f +refs/heads/master: eef6e7b286e6dcf39a9b8c1d31477ee489451a8a 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); \ }) /*