diff options
author | Stoyan Gaydarov <stoyboyker@gmail.com> | 2009-03-10 01:10:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:54:26 -0400 |
commit | 2961f24f78f456a0a2d0dada56ee795232fe21b3 (patch) | |
tree | 9dd7147ed5076879d42bf70cb61865bc87f11313 /drivers/staging | |
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>
Diffstat (limited to 'drivers/staging')
-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 3e397d01ccce..6e13e450dc73 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 | |||
544 | 544 | ||
545 | if (s->munge == NULL || (async->cmd.flags & CMDF_RAWDATA)) { | 545 | if (s->munge == NULL || (async->cmd.flags & CMDF_RAWDATA)) { |
546 | async->munge_count += num_bytes; | 546 | async->munge_count += num_bytes; |
547 | if ((int)(async->munge_count - async->buf_write_count) > 0) | 547 | BUG_ON((int)(async->munge_count - async->buf_write_count) > 0); |
548 | BUG(); | ||
549 | return num_bytes; | 548 | return num_bytes; |
550 | } | 549 | } |
551 | /* don't munge partial samples */ | 550 | /* don't munge partial samples */ |
@@ -575,8 +574,7 @@ unsigned int comedi_buf_munge(struct comedi_async *async, unsigned int num_bytes | |||
575 | async->munge_ptr %= async->prealloc_bufsz; | 574 | async->munge_ptr %= async->prealloc_bufsz; |
576 | count += block_size; | 575 | count += block_size; |
577 | } | 576 | } |
578 | if ((int)(async->munge_count - async->buf_write_count) > 0) | 577 | BUG_ON((int)(async->munge_count - async->buf_write_count) > 0); |
579 | BUG(); | ||
580 | return count; | 578 | return count; |
581 | } | 579 | } |
582 | 580 | ||
diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c index a0b1e0b452db..4db8f6e75ad8 100644 --- a/drivers/staging/otus/wwrap.c +++ b/drivers/staging/otus/wwrap.c | |||
@@ -350,8 +350,7 @@ void zfLnxUsbDataIn_callback(urb_t *urb) | |||
350 | buf->len = 0; | 350 | buf->len = 0; |
351 | #endif | 351 | #endif |
352 | 352 | ||
353 | if ((buf->tail + urb->actual_length) > buf->end) | 353 | BUG_ON((buf->tail + urb->actual_length) > buf->end); |
354 | BUG(); | ||
355 | 354 | ||
356 | skb_put(buf, urb->actual_length); | 355 | skb_put(buf, urb->actual_length); |
357 | 356 | ||
diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c index 0fd33a62d934..e4c71435aa11 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, | |||
31 | char *s = out; | 31 | char *s = out; |
32 | int i = 0; | 32 | int i = 0; |
33 | 33 | ||
34 | if (!the_controller || !out) | 34 | BUG_ON(!the_controller || !out); |
35 | BUG(); | ||
36 | 35 | ||
37 | spin_lock(&the_controller->lock); | 36 | spin_lock(&the_controller->lock); |
38 | 37 | ||
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 13a8ace1a03c..888198c9a106 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) | |||
3176 | goto exit; | 3176 | goto exit; |
3177 | 3177 | ||
3178 | skb = hw->rx_urb_skb; | 3178 | skb = hw->rx_urb_skb; |
3179 | if (!skb || (skb->data != urb->transfer_buffer)) | 3179 | BUG_ON(!skb || (skb->data != urb->transfer_buffer)); |
3180 | BUG(); | ||
3181 | 3180 | ||
3182 | hw->rx_urb_skb = NULL; | 3181 | hw->rx_urb_skb = NULL; |
3183 | 3182 | ||