Merge "ASoC: wsa883x: Avoid temperature read during playback"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
5e475581e8
@@ -620,9 +620,14 @@ static int wsa_get_temp(struct snd_kcontrol *kcontrol,
|
|||||||
{
|
{
|
||||||
struct snd_soc_component *component =
|
struct snd_soc_component *component =
|
||||||
snd_soc_kcontrol_component(kcontrol);
|
snd_soc_kcontrol_component(kcontrol);
|
||||||
|
struct wsa883x_priv *wsa883x = snd_soc_component_get_drvdata(component);
|
||||||
int temp = 0;
|
int temp = 0;
|
||||||
|
|
||||||
|
if (test_bit(SPKR_STATUS, &wsa883x->status_mask))
|
||||||
|
temp = wsa883x->curr_temp;
|
||||||
|
else
|
||||||
wsa883x_get_temperature(component, &temp);
|
wsa883x_get_temperature(component, &temp);
|
||||||
|
|
||||||
ucontrol->value.integer.value[0] = temp;
|
ucontrol->value.integer.value[0] = temp;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Reference in New Issue
Block a user