diff options
| author |   Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 15:59:38 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2011-01-10 16:45:53 +0100 |
| commit | 1f4d7be7293aecd5f8469a46f606f62f0f05d84c (patch) | |
| tree | d0caf037ec00a8684b18e8d413990c82cfc5f48a /sound/pci/oxygen/oxygen.h | |
| parent | ALSA: Don't leak in sound/core/oss/pcm_oss.c::snd_pcm_hw_param_near() (diff) | |
| download | linux-dev-1f4d7be7293aecd5f8469a46f606f62f0f05d84c.tar.xz linux-dev-1f4d7be7293aecd5f8469a46f606f62f0f05d84c.zip | |
ALSA: oxygen: allow different number of PCM and mixer channels
For cards like the Xonar HDAV1.3, differentiate between the number of
PCM channels that can be played and the number of channels whose volume
can be adjusted.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.h')
| -rw-r--r-- | sound/pci/oxygen/oxygen.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index b8fbc15b89a3..3d9535c2debb 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h @@ -100,7 +100,8 @@ struct oxygen_model { unsigned long private_data; size_t model_data_size; unsigned int device_config; - u8 dac_channels; + u8 dac_channels_pcm; + u8 dac_channels_mixer; u8 dac_volume_min; u8 dac_volume_max; u8 misc_flags; |