diff --git a/[refs] b/[refs] index 27f03b9bf0cf..94643a8c1fd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebfdeea3df2b8c265975b6acc47996a0b7c507e8 +refs/heads/master: 7affdc17d49b5d9e9c350d5d99ee34ab8655c7b4 diff --git a/trunk/sound/usb/usbmixer.c b/trunk/sound/usb/usbmixer.c index 170bfd4fc9f6..03f125dca5ff 100644 --- a/trunk/sound/usb/usbmixer.c +++ b/trunk/sound/usb/usbmixer.c @@ -1856,8 +1856,9 @@ static void snd_usb_mixer_proc_read(struct snd_info_entry *entry, list_for_each_entry(mixer, &chip->mixer_list, list) { snd_iprintf(buffer, - "USB Mixer: ctrlif=%i, ctlerr=%i\n", - mixer->ctrlif, mixer->ignore_ctl_error); + "USB Mixer: usb_id=0x%08x, ctrlif=%i, ctlerr=%i\n", + chip->usb_id, mixer->ctrlif, + mixer->ignore_ctl_error); snd_iprintf(buffer, "Card: %s\n", chip->card->longname); for (unitid = 0; unitid < MAX_ID_ELEMS; unitid++) { for (cval = mixer->id_elems[unitid]; cval;