mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	ASoC: codecs: tx-macro: fix kcontrol put
tx_macro_tx_mixer_put() and tx_macro_dec_mode_put() currently returns zero
eventhough it changes the value.
Fix this, so that change notifications are sent correctly.
Fixes: d207bdea0c ("ASoC: codecs: lpass-tx-macro: add dapm widgets and route")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220906170112.1984-6-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
			
			
This commit is contained in:
		
							parent
							
								
									1c6a7f5250
								
							
						
					
					
						commit
						c1057a08af
					
				
					 1 changed files with 11 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -822,17 +822,23 @@ static int tx_macro_tx_mixer_put(struct snd_kcontrol *kcontrol,
 | 
			
		|||
	struct tx_macro *tx = snd_soc_component_get_drvdata(component);
 | 
			
		||||
 | 
			
		||||
	if (enable) {
 | 
			
		||||
		if (tx->active_decimator[dai_id] == dec_id)
 | 
			
		||||
			return 0;
 | 
			
		||||
 | 
			
		||||
		set_bit(dec_id, &tx->active_ch_mask[dai_id]);
 | 
			
		||||
		tx->active_ch_cnt[dai_id]++;
 | 
			
		||||
		tx->active_decimator[dai_id] = dec_id;
 | 
			
		||||
	} else {
 | 
			
		||||
		if (tx->active_decimator[dai_id] == -1)
 | 
			
		||||
			return 0;
 | 
			
		||||
 | 
			
		||||
		tx->active_ch_cnt[dai_id]--;
 | 
			
		||||
		clear_bit(dec_id, &tx->active_ch_mask[dai_id]);
 | 
			
		||||
		tx->active_decimator[dai_id] = -1;
 | 
			
		||||
	}
 | 
			
		||||
	snd_soc_dapm_mixer_update_power(widget->dapm, kcontrol, enable, update);
 | 
			
		||||
 | 
			
		||||
	return 0;
 | 
			
		||||
	return 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int tx_macro_enable_dec(struct snd_soc_dapm_widget *w,
 | 
			
		||||
| 
						 | 
				
			
			@ -1018,9 +1024,12 @@ static int tx_macro_dec_mode_put(struct snd_kcontrol *kcontrol,
 | 
			
		|||
	int path = e->shift_l;
 | 
			
		||||
	struct tx_macro *tx = snd_soc_component_get_drvdata(component);
 | 
			
		||||
 | 
			
		||||
	if (tx->dec_mode[path] == value)
 | 
			
		||||
		return 0;
 | 
			
		||||
 | 
			
		||||
	tx->dec_mode[path] = value;
 | 
			
		||||
 | 
			
		||||
	return 0;
 | 
			
		||||
	return 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int tx_macro_get_bcs(struct snd_kcontrol *kcontrol,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue