summaryrefslogtreecommitdiffstats
path: root/sound/usb/card.h
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-03-04 19:46:14 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-05 08:18:07 +0100
commite11b4e0e4f5ab40ec342dc07b7201c09a45f9574 (patch)
tree9157d227a8bbbcff27235900c3720450cd4bed7f /sound/usb/card.h
parente5779998bf8b70e48a6cc208c8b61b33bd6117ea (diff)
downloadlinux-e11b4e0e4f5ab40ec342dc07b7201c09a45f9574.tar.gz
linux-e11b4e0e4f5ab40ec342dc07b7201c09a45f9574.tar.bz2
linux-e11b4e0e4f5ab40ec342dc07b7201c09a45f9574.zip
ALSA: usb-audio: rename substream format field to altset_idx
The snd_usb_substream::format field actually contains the index of the current alternate setting, so rename it to altset_idx to avoid confusion. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/card.h')
-rw-r--r--sound/usb/card.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/card.h b/sound/usb/card.h
index 71f03c151030..856d71b7407d 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -54,7 +54,7 @@ struct snd_usb_substream {
struct audioformat *cur_audiofmt; /* current audioformat pointer (for hw_params callback) */
unsigned int cur_rate; /* current rate (for hw_params callback) */
unsigned int period_bytes; /* current period bytes (for hw_params callback) */
- unsigned int format; /* USB data format */
+ unsigned int altset_idx; /* USB data format: index of alternate setting */
unsigned int datapipe; /* the data i/o pipe */
unsigned int syncpipe; /* 1 - async out or adaptive in */
unsigned int datainterval; /* log_2 of data packet interval */