diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-02-16 16:32:04 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-02-16 16:32:04 +0300 |
| commit | 1bdb78368f9448cf0de9b11eb1388e887d1b4849 (patch) | |
| tree | 82a70b8d8502d5078dc36d67fbb7bc315e760d63 /sound/soc/codecs/rt5682.c | |
| parent | 5661706efa200252d0e9fea02421b0a5857808c3 (diff) | |
| parent | 76f5aaabce492aa6991c28c96bb78b00b05d06c5 (diff) | |
| download | linux-1bdb78368f9448cf0de9b11eb1388e887d1b4849.tar.xz | |
Merge tag 'asoc-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v6.3
There's been quite a lot of activity this release, but not really
one big feature - lots of new devices, plus a lot of cleanup and
modernisation work spread throughout the subsystem:
- More factoring out of common operations into helper functions
by Morimoto-san.
- DT schema conversons and stylistic nits.
- Continued work on building out the new SOF IPC4 scheme.
- Support for Awinc AT88395, Infineon PEB2466, Iron Device
SMA1303, Mediatek MT8188, Realtek RT712, Renesas IDT821034,
Samsung/Tesla FSD SoC I2S, and TI TAS5720A-Q1.
Diffstat (limited to 'sound/soc/codecs/rt5682.c')
| -rw-r--r-- | sound/soc/codecs/rt5682.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 7e3eb65afe16..f6c798b65c08 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -1094,8 +1094,8 @@ void rt5682_jack_detect_handler(struct work_struct *work) struct snd_soc_dapm_context *dapm; int val, btn_type; - if (!rt5682->component || !rt5682->component->card || - !rt5682->component->card->instantiated) { + if (!rt5682->component || + !snd_soc_card_is_instantiated(rt5682->component->card)) { /* card not yet ready, try later */ mod_delayed_work(system_power_efficient_wq, &rt5682->jack_detect_work, msecs_to_jiffies(15)); |