diff options
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r-- | sound/usb/usbaudio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 44b9cdc8a83b..8db0374e10d5 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -1083,6 +1083,8 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri | |||
1083 | } else | 1083 | } else |
1084 | urb_packs = 1; | 1084 | urb_packs = 1; |
1085 | urb_packs *= packs_per_ms; | 1085 | urb_packs *= packs_per_ms; |
1086 | if (subs->syncpipe) | ||
1087 | urb_packs = min(urb_packs, 1U << subs->syncinterval); | ||
1086 | 1088 | ||
1087 | /* decide how many packets to be used */ | 1089 | /* decide how many packets to be used */ |
1088 | if (is_playback) { | 1090 | if (is_playback) { |
@@ -2124,8 +2126,8 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s | |||
2124 | fp = list_entry(p, struct audioformat, list); | 2126 | fp = list_entry(p, struct audioformat, list); |
2125 | snd_iprintf(buffer, " Interface %d\n", fp->iface); | 2127 | snd_iprintf(buffer, " Interface %d\n", fp->iface); |
2126 | snd_iprintf(buffer, " Altset %d\n", fp->altsetting); | 2128 | snd_iprintf(buffer, " Altset %d\n", fp->altsetting); |
2127 | snd_iprintf(buffer, " Format: %#x (%d bits)\n", | 2129 | snd_iprintf(buffer, " Format: %s\n", |
2128 | fp->format, snd_pcm_format_width(fp->format)); | 2130 | snd_pcm_format_name(fp->format)); |
2129 | snd_iprintf(buffer, " Channels: %d\n", fp->channels); | 2131 | snd_iprintf(buffer, " Channels: %d\n", fp->channels); |
2130 | snd_iprintf(buffer, " Endpoint: %d %s (%s)\n", | 2132 | snd_iprintf(buffer, " Endpoint: %d %s (%s)\n", |
2131 | fp->endpoint & USB_ENDPOINT_NUMBER_MASK, | 2133 | fp->endpoint & USB_ENDPOINT_NUMBER_MASK, |