diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:03:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:03:29 +0100 |
| commit | 70324494b6f283311c5339fb1795fdec2d8850d9 (patch) | |
| tree | 5a318c2b60ba6e7861d630310d1930f62b8893ce /sound/usb/proc.c | |
| parent | 73b5301b02c8d3456a5ea64c9ed9802a4a376af6 (diff) | |
| parent | e47a682ace0cd56eb8e09b806c2b0f034b491520 (diff) | |
Merge branch 'spi-linus' into spi-next
Diffstat (limited to 'sound/usb/proc.c')
| -rw-r--r-- | sound/usb/proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/proc.c b/sound/usb/proc.c index ebc1a5b5b3f..d218f763501 100644 --- a/sound/usb/proc.c +++ b/sound/usb/proc.c @@ -108,7 +108,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s } snd_iprintf(buffer, "\n"); } - if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL) + if (subs->speed != USB_SPEED_FULL) snd_iprintf(buffer, " Data packet interval: %d us\n", 125 * (1 << fp->datainterval)); // snd_iprintf(buffer, " Max Packet Size = %d\n", fp->maxpacksize); @@ -124,7 +124,7 @@ static void proc_dump_ep_status(struct snd_usb_substream *subs, return; snd_iprintf(buffer, " Packet Size = %d\n", ep->curpacksize); snd_iprintf(buffer, " Momentary freq = %u Hz (%#x.%04x)\n", - snd_usb_get_speed(subs->dev) == USB_SPEED_FULL + subs->speed == USB_SPEED_FULL ? get_full_speed_hz(ep->freqm) : get_high_speed_hz(ep->freqm), ep->freqm >> 16, ep->freqm & 0xffff); |