Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62428f7b authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

sound: oxygen: fix input monitor control names 



Insert "Playback" into the input monitor control names to prevent
alsa-lib from treating these controls as global controls.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1ff04886

sound/pci/oxygen/oxygen_mixer.c

+8 −8
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ static const struct { 
		.controls = {

			{

				.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

				.name = "Analog Input Monitor Switch",

				.name = "Analog Input Monitor Playback Switch",

				.info = snd_ctl_boolean_mono_info,

				.get = monitor_get,

				.put = monitor_put,
@@ -813,7 +813,7 @@ static const struct { 
			},

			{

				.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

				.name = "Analog Input Monitor Volume",

				.name = "Analog Input Monitor Playback Volume",

				.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |

					  SNDRV_CTL_ELEM_ACCESS_TLV_READ,

				.info = monitor_volume_info,
@@ -830,7 +830,7 @@ static const struct { 
		.controls = {

			{

				.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

				.name = "Analog Input Monitor Switch",

				.name = "Analog Input Monitor Playback Switch",

				.info = snd_ctl_boolean_mono_info,

				.get = monitor_get,

				.put = monitor_put,
@@ -838,7 +838,7 @@ static const struct { 
			},

			{

				.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

				.name = "Analog Input Monitor Volume",

				.name = "Analog Input Monitor Playback Volume",

				.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |

					  SNDRV_CTL_ELEM_ACCESS_TLV_READ,

				.info = monitor_volume_info,
@@ -855,7 +855,7 @@ static const struct { 
		.controls = {

			{

				.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

				.name = "Analog Input Monitor Switch",

				.name = "Analog Input Monitor Playback Switch",

				.index = 1,

				.info = snd_ctl_boolean_mono_info,

				.get = monitor_get,
@@ -864,7 +864,7 @@ static const struct { 
			},

			{

				.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

				.name = "Analog Input Monitor Volume",

				.name = "Analog Input Monitor Playback Volume",

				.index = 1,

				.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |

					  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
@@ -882,7 +882,7 @@ static const struct { 
		.controls = {

			{

				.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

				.name = "Digital Input Monitor Switch",

				.name = "Digital Input Monitor Playback Switch",

				.info = snd_ctl_boolean_mono_info,

				.get = monitor_get,

				.put = monitor_put,
@@ -890,7 +890,7 @@ static const struct { 
			},

			{

				.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

				.name = "Digital Input Monitor Volume",

				.name = "Digital Input Monitor Playback Volume",

				.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |

					  SNDRV_CTL_ELEM_ACCESS_TLV_READ,

				.info = monitor_volume_info,