diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2019-06-13 17:33:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-06-13 17:33:34 +0200 |
| commit | 84396d141894c52f55c1276630587862f5ced7dd (patch) | |
| tree | 444043322d1afe7502b8bad825c0097502a83ddb /sound/soc/codecs/rt274.c | |
| parent | ALSA: ice1712: Check correct return value to snd_i2c_sendbytes (EWS/DMX 6Fire) (diff) | |
| parent | ASoC: Intel: sst: fix kmalloc call with wrong flags (diff) | |
| download | linux-dev-84396d141894c52f55c1276630587862f5ced7dd.tar.xz linux-dev-84396d141894c52f55c1276630587862f5ced7dd.zip | |
Merge tag 'asoc-fix-v5.2-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.2
There's an awful lot of fixes here, almost all for the newly introduced
SoF DSP drivers (including a few things it turned up in shared code).
This is a large and complex piece of code so it's not surprising that
there have been quite a few issues here, fortunately things seem to have
mostly calmed down now. Otherwise there's just a smattering of small fixes.
Diffstat (limited to 'sound/soc/codecs/rt274.c')
| -rw-r--r-- | sound/soc/codecs/rt274.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt274.c b/sound/soc/codecs/rt274.c index adf59039a3b6..cdd312db3e78 100644 --- a/sound/soc/codecs/rt274.c +++ b/sound/soc/codecs/rt274.c @@ -405,6 +405,8 @@ static int rt274_mic_detect(struct snd_soc_component *component, { struct rt274_priv *rt274 = snd_soc_component_get_drvdata(component); + rt274->jack = jack; + if (jack == NULL) { /* Disable jack detection */ regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL, @@ -412,7 +414,6 @@ static int rt274_mic_detect(struct snd_soc_component *component, return 0; } - rt274->jack = jack; regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL, RT274_IRQ_EN, RT274_IRQ_EN); |