Commit 8bd54046 authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA CVS update - Clemens Ladisch <clemens@ladisch.de>

USB generic driver
(Alan Stern) use altsetting number instead of index in messages
parent 6278f6fa
...@@ -1232,7 +1232,7 @@ static int set_format(snd_usb_substream_t *subs, struct audioformat *fmt) ...@@ -1232,7 +1232,7 @@ static int set_format(snd_usb_substream_t *subs, struct audioformat *fmt)
dev->devnum, fmt->iface, fmt->altsetting); dev->devnum, fmt->iface, fmt->altsetting);
return -EIO; return -EIO;
} }
snd_printdd(KERN_INFO "setting usb interface %d:%d\n", fmt->iface, fmt->altset_idx); snd_printdd(KERN_INFO "setting usb interface %d:%d\n", fmt->iface, fmt->altsetting);
subs->interface = fmt->iface; subs->interface = fmt->iface;
subs->format = fmt->altset_idx; subs->format = fmt->altset_idx;
} }
...@@ -1953,7 +1953,7 @@ static void proc_dump_substream_formats(snd_usb_substream_t *subs, snd_info_buff ...@@ -1953,7 +1953,7 @@ static void proc_dump_substream_formats(snd_usb_substream_t *subs, snd_info_buff
struct audioformat *fp; struct audioformat *fp;
fp = list_entry(p, struct audioformat, list); fp = list_entry(p, struct audioformat, list);
snd_iprintf(buffer, " Interface %d\n", fp->iface); snd_iprintf(buffer, " Interface %d\n", fp->iface);
snd_iprintf(buffer, " Altset %d\n", fp->altset_idx); snd_iprintf(buffer, " Altset %d\n", fp->altsetting);
snd_iprintf(buffer, " Format: %s\n", snd_pcm_format_name(fp->format)); snd_iprintf(buffer, " Format: %s\n", snd_pcm_format_name(fp->format));
snd_iprintf(buffer, " Channels: %d\n", fp->channels); snd_iprintf(buffer, " Channels: %d\n", fp->channels);
snd_iprintf(buffer, " Endpoint: %d %s (%s)\n", snd_iprintf(buffer, " Endpoint: %d %s (%s)\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment