summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2021-03-01 18:34:10 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-25 09:04:06 +0100
commitb94b71a7a6f62f5f85c4949b1f71aa460aa39604 (patch)
tree2a937d06c3722aac6a5222442eb6eba898258463 /sound
parent4da5a9a73c4c4c3405860022ca17dbad2a1817f0 (diff)
downloadlinux-stable-b94b71a7a6f62f5f85c4949b1f71aa460aa39604.tar.gz
linux-stable-b94b71a7a6f62f5f85c4949b1f71aa460aa39604.tar.bz2
linux-stable-b94b71a7a6f62f5f85c4949b1f71aa460aa39604.zip
ASoC: SOF: Intel: unregister DMIC device on probe error
commit 5bb0ecddb2a7f638d65e457f3da9fa334c967b14 upstream. We only unregister the platform device during the .remove operation, but if the probe fails we will never reach this sequence. Suggested-by: Bard Liao <yung-chuan.liao@linux.intel.com> Fixes: dd96daca6c83e ("ASoC: SOF: Intel: Add APL/CNL HW DSP support") Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Link: https://lore.kernel.org/r/20210302003410.1178535-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sof/intel/hda.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index bb4128a72a42..b0faf050132d 100644
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -898,6 +898,7 @@ free_streams:
/* dsp_unmap: not currently used */
iounmap(sdev->bar[HDA_DSP_BAR]);
hdac_bus_unmap:
+ platform_device_unregister(hdev->dmic_dev);
iounmap(bus->remap_addr);
hda_codec_i915_exit(sdev);
err: