Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.git] / drivers / video / ffb.c

diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 9c9b21d..7633e41 100644 (file)
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -466,8 +466,7 @@ static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
        unsigned long flags;
        u32 fg;
 
-       if (rect->rop != ROP_COPY && rect->rop != ROP_XOR)
-               BUG();
+       BUG_ON(rect->rop != ROP_COPY && rect->rop != ROP_XOR);
 
        fg = ((u32 *)info->pseudo_palette)[rect->color];