diff options
| author | Mark Brown <broonie@kernel.org> | 2020-01-17 15:38:56 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-17 15:38:56 +0000 |
| commit | ea3f0ce756d678f94fd3060311030c5ed855e591 (patch) | |
| tree | 165a8bd1c03e0801b118e53c46032e6eecd1edbe /sound/soc/codecs/hdac_hda.c | |
| parent | a174a6c226796824cb2f78157c0b183ed472fa3f (diff) | |
| parent | 85578bbd642f65065039b1765ebe1a867d5435b0 (diff) | |
| download | linux-ea3f0ce756d678f94fd3060311030c5ed855e591.tar.bz2 | |
Merge tag 'asoc-fix-v5.5-rc6' into asoc-5.6
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 4e0f4afe6ddc..de003acb1951 100644 --- a/sound/soc/codecs/hdac_hda.c +++ b/sound/soc/codecs/hdac_hda.c @@ -604,7 +604,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; } |