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

Commit fe158eec authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Greg Kroah-Hartman
Browse files

ALSA: i2c/cs8427: fix iec958 mixer control deactivation 



commit e98e7a82bca2b6dce3e03719cff800ec913f9af7 upstream.

snd_cs8427_iec958_active() would always delete
SNDRV_CTL_ELEM_ACCESS_INACTIVE, even though the function has an
argument `active`.

Signed-off-by: default avatarOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20230405201219.2197811-1-oswald.buddenhagen@gmx.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aa23fa32

sound/i2c/cs8427.c

+5 −2
Original line number Diff line number Diff line
@@ -553,10 +553,13 @@ int snd_cs8427_iec958_active(struct snd_i2c_device *cs8427, int active) 
	if (snd_BUG_ON(!cs8427))

		return -ENXIO;

	chip = cs8427->private_data;

	if (active)

	if (active) {

		memcpy(chip->playback.pcm_status,

		       chip->playback.def_status, 24);

		chip->playback.pcm_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;

	} else {

		chip->playback.pcm_ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;

	}

	snd_ctl_notify(cs8427->bus->card,

		       SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO,

		       &chip->playback.pcm_ctl->id);