diff options
| author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2019-05-31 18:01:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-03 18:43:23 +0200 |
| commit | d6947bb234dcc86e878d502516d0fb9d635aa2ae (patch) | |
| tree | bbbae59e2c1cbd58b8b409ee5b78ad98fff72026 /sound/pci/hda/hda_codec.c | |
| parent | ASoC: SOF: ipc: replace fw ready bitfield with explicit bit ordering (diff) | |
| download | linux-d6947bb234dcc86e878d502516d0fb9d635aa2ae.tar.xz linux-d6947bb234dcc86e878d502516d0fb9d635aa2ae.zip | |
ASoC: hda: fix unbalanced codec dev refcount for HDA_DEV_ASOC
HDA_DEV_ASOC type codec device refcounts are managed differently
from HDA_DEV_LEGACY devices. The refcount is released explicitly
in snd_hdac_ext_bus_device_remove() for ASOC type devices.
So, remove the put_device() call in snd_hda_codec_dev_free()
for such devices to make the refcount balanced. This will prevent
the NULL pointer exception when the codec driver is released
after the card is freed.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index ec0b8595eb4d..6cdec64dc68a 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -834,7 +834,14 @@ static int snd_hda_codec_dev_free(struct snd_device *device) codec->in_freeing = 1; snd_hdac_device_unregister(&codec->core); codec_display_power(codec, false); - put_device(hda_codec_dev(codec)); + + /* + * In the case of ASoC HD-audio bus, the device refcount is released in + * snd_hdac_ext_bus_device_remove() explicitly. + */ + if (codec->core.type == HDA_DEV_LEGACY) + put_device(hda_codec_dev(codec)); + return 0; } |