diff options
Diffstat (limited to 'sound/usb/usx2y/usbusx2yaudio.c')
| -rw-r--r-- | sound/usb/usx2y/usbusx2yaudio.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 0f09e0de52dd..affda973cece 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c | |||
| @@ -78,7 +78,7 @@ static int usX2Y_urb_capt_retire(snd_usX2Y_substream_t *subs) | |||
| 78 | for (i = 0; i < nr_of_packs(); i++) { | 78 | for (i = 0; i < nr_of_packs(); i++) { |
| 79 | cp = (unsigned char*)urb->transfer_buffer + urb->iso_frame_desc[i].offset; | 79 | cp = (unsigned char*)urb->transfer_buffer + urb->iso_frame_desc[i].offset; |
| 80 | if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */ | 80 | if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */ |
| 81 | snd_printk("activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status); | 81 | snd_printk(KERN_ERR "activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status); |
| 82 | return urb->iso_frame_desc[i].status; | 82 | return urb->iso_frame_desc[i].status; |
| 83 | } | 83 | } |
| 84 | len = urb->iso_frame_desc[i].actual_length / usX2Y->stride; | 84 | len = urb->iso_frame_desc[i].actual_length / usX2Y->stride; |
| @@ -134,7 +134,7 @@ static int usX2Y_urb_play_prepare(snd_usX2Y_substream_t *subs, | |||
| 134 | counts = cap_urb->iso_frame_desc[pack].actual_length / usX2Y->stride; | 134 | counts = cap_urb->iso_frame_desc[pack].actual_length / usX2Y->stride; |
| 135 | count += counts; | 135 | count += counts; |
| 136 | if (counts < 43 || counts > 50) { | 136 | if (counts < 43 || counts > 50) { |
| 137 | snd_printk("should not be here with counts=%i\n", counts); | 137 | snd_printk(KERN_ERR "should not be here with counts=%i\n", counts); |
| 138 | return -EPIPE; | 138 | return -EPIPE; |
| 139 | } | 139 | } |
| 140 | /* set up descriptor */ | 140 | /* set up descriptor */ |
| @@ -196,7 +196,7 @@ static int usX2Y_urb_submit(snd_usX2Y_substream_t *subs, struct urb *urb, int fr | |||
| 196 | urb->hcpriv = NULL; | 196 | urb->hcpriv = NULL; |
| 197 | urb->dev = subs->usX2Y->chip.dev; /* we need to set this at each time */ | 197 | urb->dev = subs->usX2Y->chip.dev; /* we need to set this at each time */ |
| 198 | if ((err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { | 198 | if ((err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { |
| 199 | snd_printk("usb_submit_urb() returned %i\n", err); | 199 | snd_printk(KERN_ERR "usb_submit_urb() returned %i\n", err); |
| 200 | return err; | 200 | return err; |
| 201 | } | 201 | } |
| 202 | return 0; | 202 | return 0; |
| @@ -283,16 +283,16 @@ static void usX2Y_clients_stop(usX2Ydev_t *usX2Y) | |||
| 283 | 283 | ||
| 284 | static void usX2Y_error_urb_status(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb) | 284 | static void usX2Y_error_urb_status(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb) |
| 285 | { | 285 | { |
| 286 | snd_printk("ep=%i stalled with status=%i\n", subs->endpoint, urb->status); | 286 | snd_printk(KERN_ERR "ep=%i stalled with status=%i\n", subs->endpoint, urb->status); |
| 287 | urb->status = 0; | 287 | urb->status = 0; |
| 288 | usX2Y_clients_stop(usX2Y); | 288 | usX2Y_clients_stop(usX2Y); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | static void usX2Y_error_sequence(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb) | 291 | static void usX2Y_error_sequence(usX2Ydev_t *usX2Y, snd_usX2Y_substream_t *subs, struct urb *urb) |
| 292 | { | 292 | { |
| 293 | snd_printk("Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n" | 293 | snd_printk(KERN_ERR "Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n" |
| 294 | "Most propably some urb of usb-frame %i is still missing.\n" | 294 | KERN_ERR "Most propably some urb of usb-frame %i is still missing.\n" |
| 295 | "Cause could be too long delays in usb-hcd interrupt handling.\n", | 295 | KERN_ERR "Cause could be too long delays in usb-hcd interrupt handling.\n", |
| 296 | usb_get_current_frame_number(usX2Y->chip.dev), | 296 | usb_get_current_frame_number(usX2Y->chip.dev), |
| 297 | subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out", usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame); | 297 | subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out", usX2Y->wait_iso_frame, urb->start_frame, usX2Y->wait_iso_frame); |
| 298 | usX2Y_clients_stop(usX2Y); | 298 | usX2Y_clients_stop(usX2Y); |
| @@ -653,9 +653,8 @@ static void i_usX2Y_04Int(struct urb* urb, struct pt_regs *regs) | |||
| 653 | { | 653 | { |
| 654 | usX2Ydev_t* usX2Y = urb->context; | 654 | usX2Ydev_t* usX2Y = urb->context; |
| 655 | 655 | ||
| 656 | if (urb->status) { | 656 | if (urb->status) |
| 657 | snd_printk("snd_usX2Y_04Int() urb->status=%i\n", urb->status); | 657 | snd_printk(KERN_ERR "snd_usX2Y_04Int() urb->status=%i\n", urb->status); |
| 658 | } | ||
| 659 | if (0 == --usX2Y->US04->len) | 658 | if (0 == --usX2Y->US04->len) |
| 660 | wake_up(&usX2Y->In04WaitQueue); | 659 | wake_up(&usX2Y->In04WaitQueue); |
| 661 | } | 660 | } |
| @@ -740,7 +739,7 @@ static int usX2Y_format_set(usX2Ydev_t *usX2Y, snd_pcm_format_t format) | |||
| 740 | } | 739 | } |
| 741 | usb_kill_urb(usX2Y->In04urb); | 740 | usb_kill_urb(usX2Y->In04urb); |
| 742 | if ((err = usb_set_interface(usX2Y->chip.dev, 0, alternate))) { | 741 | if ((err = usb_set_interface(usX2Y->chip.dev, 0, alternate))) { |
| 743 | snd_printk("usb_set_interface error \n"); | 742 | snd_printk(KERN_ERR "usb_set_interface error \n"); |
| 744 | return err; | 743 | return err; |
| 745 | } | 744 | } |
| 746 | usX2Y->In04urb->dev = usX2Y->chip.dev; | 745 | usX2Y->In04urb->dev = usX2Y->chip.dev; |
| @@ -787,7 +786,7 @@ static int snd_usX2Y_pcm_hw_params(snd_pcm_substream_t *substream, | |||
| 787 | } | 786 | } |
| 788 | } | 787 | } |
| 789 | if (0 > (err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)))) { | 788 | if (0 > (err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)))) { |
| 790 | snd_printk("snd_pcm_lib_malloc_pages(%p, %i) returned %i\n", substream, params_buffer_bytes(hw_params), err); | 789 | snd_printk(KERN_ERR "snd_pcm_lib_malloc_pages(%p, %i) returned %i\n", substream, params_buffer_bytes(hw_params), err); |
| 791 | return err; | 790 | return err; |
| 792 | } | 791 | } |
| 793 | return 0; | 792 | return 0; |
