diff options
Diffstat (limited to 'drivers/usb/atm/usbatm.c')
-rw-r--r-- | drivers/usb/atm/usbatm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 0da2c25bab3b..06dd114910d4 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c | |||
@@ -344,7 +344,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char | |||
344 | __func__, sarb->len, vcc); | 344 | __func__, sarb->len, vcc); |
345 | /* discard cells already received */ | 345 | /* discard cells already received */ |
346 | skb_trim(sarb, 0); | 346 | skb_trim(sarb, 0); |
347 | UDSL_ASSERT(sarb->tail + ATM_CELL_PAYLOAD <= sarb->end); | 347 | UDSL_ASSERT(instance, sarb->tail + ATM_CELL_PAYLOAD <= sarb->end); |
348 | } | 348 | } |
349 | 349 | ||
350 | memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD); | 350 | memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD); |
@@ -432,7 +432,7 @@ static void usbatm_extract_cells(struct usbatm_data *instance, | |||
432 | unsigned char *cell_buf = instance->cell_buf; | 432 | unsigned char *cell_buf = instance->cell_buf; |
433 | unsigned int space_left = stride - buf_usage; | 433 | unsigned int space_left = stride - buf_usage; |
434 | 434 | ||
435 | UDSL_ASSERT(buf_usage <= stride); | 435 | UDSL_ASSERT(instance, buf_usage <= stride); |
436 | 436 | ||
437 | if (avail_data >= space_left) { | 437 | if (avail_data >= space_left) { |
438 | /* add new data and process cell */ | 438 | /* add new data and process cell */ |
@@ -475,7 +475,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance, | |||
475 | unsigned int stride = instance->tx_channel.stride; | 475 | unsigned int stride = instance->tx_channel.stride; |
476 | 476 | ||
477 | vdbg("%s: skb->len=%d, avail_space=%u", __func__, skb->len, avail_space); | 477 | vdbg("%s: skb->len=%d, avail_space=%u", __func__, skb->len, avail_space); |
478 | UDSL_ASSERT(!(avail_space % stride)); | 478 | UDSL_ASSERT(instance, !(avail_space % stride)); |
479 | 479 | ||
480 | for (bytes_written = 0; bytes_written < avail_space && ctrl->len; | 480 | for (bytes_written = 0; bytes_written < avail_space && ctrl->len; |
481 | bytes_written += stride, target += stride) { | 481 | bytes_written += stride, target += stride) { |
@@ -547,7 +547,7 @@ static void usbatm_rx_process(unsigned long data) | |||
547 | if (!urb->iso_frame_desc[i].status) { | 547 | if (!urb->iso_frame_desc[i].status) { |
548 | unsigned int actual_length = urb->iso_frame_desc[i].actual_length; | 548 | unsigned int actual_length = urb->iso_frame_desc[i].actual_length; |
549 | 549 | ||
550 | UDSL_ASSERT(actual_length <= packet_size); | 550 | UDSL_ASSERT(instance, actual_length <= packet_size); |
551 | 551 | ||
552 | if (!merge_length) | 552 | if (!merge_length) |
553 | merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset; | 553 | merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset; |
@@ -1188,7 +1188,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, | |||
1188 | struct urb *urb; | 1188 | struct urb *urb; |
1189 | unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0; | 1189 | unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0; |
1190 | 1190 | ||
1191 | UDSL_ASSERT(!usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint)); | 1191 | UDSL_ASSERT(instance, !usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint)); |
1192 | 1192 | ||
1193 | urb = usb_alloc_urb(iso_packets, GFP_KERNEL); | 1193 | urb = usb_alloc_urb(iso_packets, GFP_KERNEL); |
1194 | if (!urb) { | 1194 | if (!urb) { |