diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2005-07-29 15:32:58 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-08-30 08:43:22 +0200 |
| commit | 67ed4161f60d76b3b27efc085b36357a6a90768c (patch) | |
| tree | d69bd70f968a1e439d8b9a43ff8d4b60eb3c8bdf /sound/isa | |
| parent | 42dfd0adab83c95890e562623264999914771763 (diff) | |
| download | linux-67ed4161f60d76b3b27efc085b36357a6a90768c.tar.gz linux-67ed4161f60d76b3b27efc085b36357a6a90768c.tar.bz2 linux-67ed4161f60d76b3b27efc085b36357a6a90768c.zip | |
[ALSA] sound - fix .iface field of mixer control elements
Documentation,CS46xx driver,EMU10K1/EMU10K2 driver,AD1848 driver
SB16/AWE driver,CMIPCI driver,ENS1370/1+ driver,RME32 driver
RME96 driver,ICE1712 driver,ICE1724 driver,KORG1212 driver
RME HDSP driver,RME9652 driver
This patch changes .iface to SNDRV_CTL_ELEM_IFACE_MIXER whre _PCM or
_HWDEP was used in controls that are not associated with a specific PCM
(sub)stream or hwdep device, and changes some controls that got
inconsitent .iface values due to copy+paste errors. Furthermore, it
makes sure that all control that do use _PCM or _HWDEP use the correct
number in the .device field.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/ad1848/ad1848_lib.c | 1 | ||||
| -rw-r--r-- | sound/isa/sb/sb16_main.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c index 8fb3db103e48..bc642dc94547 100644 --- a/sound/isa/ad1848/ad1848_lib.c +++ b/sound/isa/ad1848/ad1848_lib.c @@ -1196,6 +1196,7 @@ int snd_ad1848_add_ctl(ad1848_t *chip, const char *name, int index, int type, un .put = snd_ad1848_put_double, }, [AD1848_MIX_CAPTURE] = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .info = snd_ad1848_info_mux, .get = snd_ad1848_get_mux, .put = snd_ad1848_put_mux, diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c index a6a0fa516268..a99e642a68b5 100644 --- a/sound/isa/sb/sb16_main.c +++ b/sound/isa/sb/sb16_main.c @@ -729,7 +729,7 @@ static int snd_sb16_dma_control_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_valu } static snd_kcontrol_new_t snd_sb16_dma_control = { - .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = "16-bit DMA Allocation", .info = snd_sb16_dma_control_info, .get = snd_sb16_dma_control_get, |