| From 55e901c53de8ac4ca5c81318baeb3dd6cce0b505 Mon Sep 17 00:00:00 2001 |
| From: Kai Vehmanen <kai.vehmanen@linux.intel.com> |
| Date: Fri, 10 Jan 2020 17:57:51 -0600 |
| Subject: [PATCH] ASoC: hdac_hda: Fix error in driver removal after failed |
| probe |
| |
| commit 552b1a85da9f63856e7e341b81c16e0e078204f1 upstream. |
| |
| In case system has multiple HDA codecs, and codec probe fails for |
| at least one but not all codecs, driver will end up cancelling |
| a non-initialized timer context upon driver removal. |
| |
| Call trace of typical case: |
| |
| [ 60.593646] WARNING: CPU: 1 PID: 1147 at kernel/workqueue.c:3032 |
| __flush_work+0x18b/0x1a0 |
| [...] |
| [ 60.593670] __cancel_work_timer+0x11f/0x1a0 |
| [ 60.593673] hdac_hda_dev_remove+0x25/0x30 [snd_soc_hdac_hda] |
| [ 60.593674] device_release_driver_internal+0xe0/0x1c0 |
| [ 60.593675] bus_remove_device+0xd6/0x140 |
| [ 60.593677] device_del+0x175/0x3e0 |
| [ 60.593679] ? widget_tree_free.isra.7+0x90/0xb0 [snd_hda_core] |
| [ 60.593680] snd_hdac_device_unregister+0x34/0x50 [snd_hda_core] |
| [ 60.593682] snd_hdac_ext_bus_device_remove+0x2a/0x60 [snd_hda_ext_core] |
| [ 60.593684] hda_dsp_remove+0x26/0x100 [snd_sof_intel_hda_common] |
| [ 60.593686] snd_sof_device_remove+0x84/0xa0 [snd_sof] |
| [ 60.593687] sof_pci_remove+0x10/0x30 [snd_sof_pci] |
| [ 60.593689] pci_device_remove+0x36/0xb0 |
| |
| Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> |
| Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> |
| Link: https://lore.kernel.org/r/20200110235751.3404-9-pierre-louis.bossart@linux.intel.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c |
| index 4570f662fb48..d78f4d856aaf 100644 |
| --- a/sound/soc/codecs/hdac_hda.c |
| +++ b/sound/soc/codecs/hdac_hda.c |
| @@ -498,7 +498,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; |
| } |
| |
| -- |
| 2.7.4 |
| |
