From 628a1af3ddce9d6cd1268536b8799fd59191e89f Mon Sep 17 00:00:00 2001
From: Stoyan Gaydarov <stoyboyker@gmail.com>
Date: Tue, 10 Mar 2009 00:10:27 -0500
Subject: [PATCH] --- yaml --- r: 141780 b: refs/heads/master c:
 2961f24f78f456a0a2d0dada56ee795232fe21b3 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/comedi/drivers.c      | 6 ++----
 trunk/drivers/staging/otus/wwrap.c          | 3 +--
 trunk/drivers/staging/usbip/vhci_sysfs.c    | 3 +--
 trunk/drivers/staging/wlan-ng/hfa384x_usb.c | 3 +--
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index c74b6e7647c7..353e220d1e02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0773a5c07641ddef7f94636292921e12f2efab02
+refs/heads/master: 2961f24f78f456a0a2d0dada56ee795232fe21b3
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index 3e397d01ccce..6e13e450dc73 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -544,8 +544,7 @@ unsigned int comedi_buf_munge(struct comedi_async *async, unsigned int num_bytes
 
 	if (s->munge == NULL || (async->cmd.flags & CMDF_RAWDATA)) {
 		async->munge_count += num_bytes;
-		if ((int)(async->munge_count - async->buf_write_count) > 0)
-			BUG();
+		BUG_ON((int)(async->munge_count - async->buf_write_count) > 0);
 		return num_bytes;
 	}
 	/* don't munge partial samples */
@@ -575,8 +574,7 @@ unsigned int comedi_buf_munge(struct comedi_async *async, unsigned int num_bytes
 		async->munge_ptr %= async->prealloc_bufsz;
 		count += block_size;
 	}
-	if ((int)(async->munge_count - async->buf_write_count) > 0)
-		BUG();
+	BUG_ON((int)(async->munge_count - async->buf_write_count) > 0);
 	return count;
 }
 
diff --git a/trunk/drivers/staging/otus/wwrap.c b/trunk/drivers/staging/otus/wwrap.c
index a0b1e0b452db..4db8f6e75ad8 100644
--- a/trunk/drivers/staging/otus/wwrap.c
+++ b/trunk/drivers/staging/otus/wwrap.c
@@ -350,8 +350,7 @@ void zfLnxUsbDataIn_callback(urb_t *urb)
     buf->len = 0;
 #endif
 
-    if ((buf->tail + urb->actual_length) > buf->end)
-        BUG();
+    BUG_ON((buf->tail + urb->actual_length) > buf->end);
 
     skb_put(buf, urb->actual_length);
 
diff --git a/trunk/drivers/staging/usbip/vhci_sysfs.c b/trunk/drivers/staging/usbip/vhci_sysfs.c
index 0fd33a62d934..e4c71435aa11 100644
--- a/trunk/drivers/staging/usbip/vhci_sysfs.c
+++ b/trunk/drivers/staging/usbip/vhci_sysfs.c
@@ -31,8 +31,7 @@ static ssize_t show_status(struct device *dev, struct device_attribute *attr,
 	char *s = out;
 	int i = 0;
 
-	if (!the_controller || !out)
-		BUG();
+	BUG_ON(!the_controller || !out);
 
 	spin_lock(&the_controller->lock);
 
diff --git a/trunk/drivers/staging/wlan-ng/hfa384x_usb.c b/trunk/drivers/staging/wlan-ng/hfa384x_usb.c
index 13a8ace1a03c..888198c9a106 100644
--- a/trunk/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/trunk/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3176,8 +3176,7 @@ static void hfa384x_usbin_callback(struct urb *urb)
 		goto exit;
 
 	skb = hw->rx_urb_skb;
-	if (!skb || (skb->data != urb->transfer_buffer))
-		BUG();
+	BUG_ON(!skb || (skb->data != urb->transfer_buffer));
 
 	hw->rx_urb_skb = NULL;