From 011e24c58e257d39487629d696aa9b219b3dd3d3 Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Fri, 24 Mar 2006 18:53:18 +0100 Subject: [PATCH] --- yaml --- r: 23690 b: refs/heads/master c: 232443e2c90cc2930624dec89df327615b002c55 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/bw2.c | 3 +-- trunk/drivers/video/ffb.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c48e357b89cc..e9a3c4f8b2b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b74945547f0679003ede4d1afcd0aa169059a436 +refs/heads/master: 232443e2c90cc2930624dec89df327615b002c55 diff --git a/trunk/drivers/video/bw2.c b/trunk/drivers/video/bw2.c index c029db4646f6..6577fdfdfc16 100644 --- a/trunk/drivers/video/bw2.c +++ b/trunk/drivers/video/bw2.c @@ -327,8 +327,7 @@ static void bw2_init_one(struct sbus_dev *sdev) } else #else { - if (!sdev) - BUG(); + BUG_ON(!sdev); all->par.physbase = sdev->reg_addrs[0].phys_addr; resp = &sdev->resource[0]; sbusfb_fill_var(&all->info.var, (sdev ? sdev->prom_node : 0), 1); diff --git a/trunk/drivers/video/ffb.c b/trunk/drivers/video/ffb.c index 9c9b21d469a1..7633e41adda1 100644 --- a/trunk/drivers/video/ffb.c +++ b/trunk/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];