diff options
Diffstat (limited to 'drivers/media/video/dabusb.c')
-rw-r--r-- | drivers/media/video/dabusb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 1774ab7a40d2..b9ba95f5e026 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
@@ -86,7 +86,7 @@ static int dabusb_add_buf_tail (pdabusb_t s, struct list_head *dst, struct list_ | |||
86 | return ret; | 86 | return ret; |
87 | } | 87 | } |
88 | /*-------------------------------------------------------------------*/ | 88 | /*-------------------------------------------------------------------*/ |
89 | #ifdef DEBUG | 89 | #ifdef DEBUG |
90 | static void dump_urb (struct urb *urb) | 90 | static void dump_urb (struct urb *urb) |
91 | { | 91 | { |
92 | dbg("urb :%p", urb); | 92 | dbg("urb :%p", urb); |
@@ -136,7 +136,7 @@ static int dabusb_free_queue (struct list_head *q) | |||
136 | for (p = q->next; p != q;) { | 136 | for (p = q->next; p != q;) { |
137 | b = list_entry (p, buff_t, buff_list); | 137 | b = list_entry (p, buff_t, buff_list); |
138 | 138 | ||
139 | #ifdef DEBUG | 139 | #ifdef DEBUG |
140 | dump_urb(b->purb); | 140 | dump_urb(b->purb); |
141 | #endif | 141 | #endif |
142 | kfree(b->purb->transfer_buffer); | 142 | kfree(b->purb->transfer_buffer); |
@@ -287,7 +287,7 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb) | |||
287 | } | 287 | } |
288 | 288 | ||
289 | } | 289 | } |
290 | 290 | ||
291 | if( ret == -EPIPE ) { | 291 | if( ret == -EPIPE ) { |
292 | warn("CLEAR_FEATURE request to remove STALL condition."); | 292 | warn("CLEAR_FEATURE request to remove STALL condition."); |
293 | if(usb_clear_halt(s->usbdev, usb_pipeendpoint(pipe))) | 293 | if(usb_clear_halt(s->usbdev, usb_pipeendpoint(pipe))) |
@@ -328,7 +328,7 @@ static int dabusb_loadmem (pdabusb_t s, const char *fname) | |||
328 | PINTEL_HEX_RECORD ptr = firmware; | 328 | PINTEL_HEX_RECORD ptr = firmware; |
329 | 329 | ||
330 | dbg("Enter dabusb_loadmem (internal)"); | 330 | dbg("Enter dabusb_loadmem (internal)"); |
331 | 331 | ||
332 | ret = dabusb_8051_reset (s, 1); | 332 | ret = dabusb_8051_reset (s, 1); |
333 | while (ptr->Type == 0) { | 333 | while (ptr->Type == 0) { |
334 | 334 | ||
@@ -449,7 +449,7 @@ static int dabusb_startrek (pdabusb_t s) | |||
449 | if (!list_empty (&s->free_buff_list)) { | 449 | if (!list_empty (&s->free_buff_list)) { |
450 | pbuff_t end; | 450 | pbuff_t end; |
451 | int ret; | 451 | int ret; |
452 | 452 | ||
453 | while (!dabusb_add_buf_tail (s, &s->rec_buff_list, &s->free_buff_list)) { | 453 | while (!dabusb_add_buf_tail (s, &s->rec_buff_list, &s->free_buff_list)) { |
454 | 454 | ||
455 | dbg("submitting: end:%p s->rec_buff_list:%p", s->rec_buff_list.prev, &s->rec_buff_list); | 455 | dbg("submitting: end:%p s->rec_buff_list:%p", s->rec_buff_list.prev, &s->rec_buff_list); |
@@ -506,7 +506,7 @@ static ssize_t dabusb_read (struct file *file, char __user *buf, size_t count, l | |||
506 | err("error: rec_buf_list is empty"); | 506 | err("error: rec_buf_list is empty"); |
507 | goto err; | 507 | goto err; |
508 | } | 508 | } |
509 | 509 | ||
510 | b = list_entry (s->rec_buff_list.next, buff_t, buff_list); | 510 | b = list_entry (s->rec_buff_list.next, buff_t, buff_list); |
511 | purb = b->purb; | 511 | purb = b->purb; |
512 | 512 | ||
@@ -783,9 +783,9 @@ static void dabusb_disconnect (struct usb_interface *intf) | |||
783 | pdabusb_t s = usb_get_intfdata (intf); | 783 | pdabusb_t s = usb_get_intfdata (intf); |
784 | 784 | ||
785 | dbg("dabusb_disconnect"); | 785 | dbg("dabusb_disconnect"); |
786 | 786 | ||
787 | init_waitqueue_entry(&__wait, current); | 787 | init_waitqueue_entry(&__wait, current); |
788 | 788 | ||
789 | usb_set_intfdata (intf, NULL); | 789 | usb_set_intfdata (intf, NULL); |
790 | if (s) { | 790 | if (s) { |
791 | usb_deregister_dev (intf, &dabusb_class); | 791 | usb_deregister_dev (intf, &dabusb_class); |
@@ -797,7 +797,7 @@ static void dabusb_disconnect (struct usb_interface *intf) | |||
797 | schedule(); | 797 | schedule(); |
798 | current->state = TASK_RUNNING; | 798 | current->state = TASK_RUNNING; |
799 | remove_wait_queue(&s->remove_ok, &__wait); | 799 | remove_wait_queue(&s->remove_ok, &__wait); |
800 | 800 | ||
801 | s->usbdev = NULL; | 801 | s->usbdev = NULL; |
802 | s->overruns = 0; | 802 | s->overruns = 0; |
803 | } | 803 | } |