Merge branch 'for-linus' of git://neil.brown.name/md

[sfrench/cifs-2.6.git] / arch / mips / jazz / jazzdma.c

diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c
index c672c08d49e597a1597fef23716d2a4b688c675f..f0fd636723be1d2663e16ada6af9aeab32a225cb 100644 (file)
--- a/arch/mips/jazz/jazzdma.c
+++ b/arch/mips/jazz/jazzdma.c
@@ -68,8 +68,7 @@ static int __init vdma_init(void)
         */
        pgtbl = (VDMA_PGTBL_ENTRY *)__get_free_pages(GFP_KERNEL | GFP_DMA,
                                                    get_order(VDMA_PGTBL_SIZE));
-       if (!pgtbl)
-               BUG();
+       BUG_ON(!pgtbl);
        dma_cache_wback_inv((unsigned long)pgtbl, VDMA_PGTBL_SIZE);
        pgtbl = (VDMA_PGTBL_ENTRY *)KSEG1ADDR(pgtbl);