diff options
| author | Stoyan Gaydarov <stoyboyker@gmail.com> | 2009-03-10 00:10:27 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:26 -0700 |
| commit | 2961f24f78f456a0a2d0dada56ee795232fe21b3 (patch) | |
| tree | 9dd7147ed5076879d42bf70cb61865bc87f11313 | |
| parent | 0773a5c07641ddef7f94636292921e12f2efab02 (diff) | |
Staging: BUG to BUG_ON changes
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 6 | ||||
| -rw-r--r-- | drivers/staging/otus/wwrap.c | 3 | ||||
| -rw-r--r-- | drivers/staging/usbip/vhci_sysfs.c | 3 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x_usb.c | 3 |
4 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 3e397d01ccc..6e13e450dc7 100644 --- a/drivers/staging/comedi/drivers.c +++ b/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/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c index a0b1e0b452d..4db8f6e75ad 100644 --- a/drivers/staging/otus/wwrap.c +++ b/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/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c index 0fd33a62d93..e4c71435aa1 100644 --- a/drivers/staging/usbip/vhci_sysfs.c +++ b/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/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 13a8ace1a03..888198c9a10 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/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; |