Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133213
b: refs/heads/master
c: 54530bd
h: refs/heads/master
i:
  133211: 76a1380
v: v3
  • Loading branch information
Takashi Iwai committed Feb 5, 2009
1 parent cc85c6e commit 7d7666b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b9d710b3c530ed91e8683933fe94c7605d175bf5
refs/heads/master: 54530bded6ecf22d683423b66fc3cd6dddb249aa
6 changes: 4 additions & 2 deletions trunk/sound/usb/usbaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1419,9 +1419,11 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
subs->cur_audiofmt = fmt;

#if 0
printk("setting done: format = %d, rate = %d..%d, channels = %d\n",
printk(KERN_DEBUG
"setting done: format = %d, rate = %d..%d, channels = %d\n",
fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels);
printk(" datapipe = 0x%0x, syncpipe = 0x%0x\n",
printk(KERN_DEBUG
" datapipe = 0x%0x, syncpipe = 0x%0x\n",
subs->datapipe, subs->syncpipe);
#endif

Expand Down
5 changes: 4 additions & 1 deletion trunk/sound/usb/usbmixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,10 @@ static int check_ignored_ctl(struct mixer_build *state, int unitid, int control)
for (p = state->map; p->id; p++) {
if (p->id == unitid && ! p->name &&
(! control || ! p->control || control == p->control)) {
// printk("ignored control %d:%d\n", unitid, control);
/*
printk(KERN_DEBUG "ignored control %d:%d\n",
unitid, control);
*/
return 1;
}
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/sound/usb/usx2y/usb_stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ static void stream_start(struct usb_stream_kernel *sk,
s->idle_insize -= max_diff - max_diff_0;
s->idle_insize += urb_size - s->period_size;
if (s->idle_insize < 0) {
snd_printk("%i %i %i\n",
snd_printk(KERN_WARNING "%i %i %i\n",
s->idle_insize, urb_size, s->period_size);
return;
} else if (s->idle_insize == 0) {
Expand Down

0 comments on commit 7d7666b

Please sign in to comment.