diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-07-29 09:32:58 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-08-30 02:43:22 -0400 |
commit | 67ed4161f60d76b3b27efc085b36357a6a90768c (patch) | |
tree | d69bd70f968a1e439d8b9a43ff8d4b60eb3c8bdf /sound/pci/ens1370.c | |
parent | 42dfd0adab83c95890e562623264999914771763 (diff) |
[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/pci/ens1370.c')
-rw-r--r-- | sound/pci/ens1370.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 78a81f3912a1..0c64e65bee97 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -1446,7 +1446,7 @@ static int snd_es1371_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t | |||
1446 | static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = { | 1446 | static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = { |
1447 | ES1371_SPDIF("IEC958 Playback Switch"), | 1447 | ES1371_SPDIF("IEC958 Playback Switch"), |
1448 | { | 1448 | { |
1449 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 1449 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
1450 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), | 1450 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), |
1451 | .info = snd_ens1373_spdif_info, | 1451 | .info = snd_ens1373_spdif_info, |
1452 | .get = snd_ens1373_spdif_default_get, | 1452 | .get = snd_ens1373_spdif_default_get, |
@@ -1454,13 +1454,13 @@ static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = { | |||
1454 | }, | 1454 | }, |
1455 | { | 1455 | { |
1456 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 1456 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
1457 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 1457 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
1458 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), | 1458 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), |
1459 | .info = snd_ens1373_spdif_info, | 1459 | .info = snd_ens1373_spdif_info, |
1460 | .get = snd_ens1373_spdif_mask_get | 1460 | .get = snd_ens1373_spdif_mask_get |
1461 | }, | 1461 | }, |
1462 | { | 1462 | { |
1463 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 1463 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
1464 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), | 1464 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), |
1465 | .info = snd_ens1373_spdif_info, | 1465 | .info = snd_ens1373_spdif_info, |
1466 | .get = snd_ens1373_spdif_stream_get, | 1466 | .get = snd_ens1373_spdif_stream_get, |