diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-12 07:38:46 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-12 07:38:46 +0100 |
commit | e6826ef14597981f78156a0d5f9553b19f356e3f (patch) | |
tree | 30a19b996778016aefc2d47d5990f0c251d14a02 /sound/firewire/dice/dice-proc.c | |
parent | 4945f1fdc14ef090abe50d1b5682bfc1e4763c06 (diff) | |
parent | be3bb8236db2d0fcd705062ae2e2a9d75131222f (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/firewire/dice/dice-proc.c')
-rw-r--r-- | sound/firewire/dice/dice-proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/dice/dice-proc.c b/sound/firewire/dice/dice-proc.c index ecfe20fd4de5..f5c1d1bced59 100644 --- a/sound/firewire/dice/dice-proc.c +++ b/sound/firewire/dice/dice-proc.c @@ -99,9 +99,9 @@ static void dice_proc_read(struct snd_info_entry *entry, } tx; struct { u32 iso; + u32 seq_start; u32 number_audio; u32 number_midi; - u32 seq_start; char names[RX_NAMES_SIZE]; u32 ac3_caps; u32 ac3_enable; @@ -204,10 +204,10 @@ static void dice_proc_read(struct snd_info_entry *entry, break; snd_iprintf(buffer, "rx %u:\n", stream); snd_iprintf(buffer, " iso channel: %d\n", (int)buf.rx.iso); + snd_iprintf(buffer, " sequence start: %u\n", buf.rx.seq_start); snd_iprintf(buffer, " audio channels: %u\n", buf.rx.number_audio); snd_iprintf(buffer, " midi ports: %u\n", buf.rx.number_midi); - snd_iprintf(buffer, " sequence start: %u\n", buf.rx.seq_start); if (quadlets >= 68) { dice_proc_fixup_string(buf.rx.names, RX_NAMES_SIZE); snd_iprintf(buffer, " names: %s\n", buf.rx.names); |