diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-01-16 14:14:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-16 14:14:26 +0100 |
| commit | e5dbdcb31285a975d623d2bf2c9e7b2940489008 (patch) | |
| tree | fbff5006000ee7e9d98320363256223bd163df98 /sound/soc/codecs/hdac_hda.c | |
| parent | 60adcfde92fa40fcb2dbf7cc52f9b096e0cd109a (diff) | |
| parent | 85578bbd642f65065039b1765ebe1a867d5435b0 (diff) | |
| download | linux-e5dbdcb31285a975d623d2bf2c9e7b2940489008.tar.bz2 | |
Merge tag 'asoc-fix-v5.5-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.5
This is mostly driver specific fixes, plus an error handling fix
in the core. There is a rather large diffstat for the stm32 SAI
driver, this is a very large but mostly mechanical update which
wraps every register access in the driver to allow a fix to the
locking which avoids circular locks, the active change is much
smaller and more reasonably sized.
Diffstat (limited to 'sound/soc/codecs/hdac_hda.c')
| -rw-r--r-- | sound/soc/codecs/hdac_hda.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c index 6803d39e09a5..43110151e928 100644 --- a/sound/soc/codecs/hdac_hda.c +++ b/sound/soc/codecs/hdac_hda.c @@ -588,7 +588,9 @@ static int hdac_hda_dev_remove(struct hdac_device *hdev) struct hdac_hda_priv *hda_pvt; hda_pvt = dev_get_drvdata(&hdev->dev); - cancel_delayed_work_sync(&hda_pvt->codec.jackpoll_work); + if (hda_pvt && hda_pvt->codec.registered) + cancel_delayed_work_sync(&hda_pvt->codec.jackpoll_work); + return 0; } |