diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-06-13 17:33:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-06-13 17:33:34 +0200 |
| commit | 84396d141894c52f55c1276630587862f5ced7dd (patch) | |
| tree | 444043322d1afe7502b8bad825c0097502a83ddb /sound/pci/hda/hda_codec.c | |
| parent | 352bcae97f9ba87801f497571cdec20af190efe1 (diff) | |
| parent | 3da428ff2aa5a5191ba2f1630eea75f03242f3f2 (diff) | |
| download | linux-84396d141894c52f55c1276630587862f5ced7dd.tar.bz2 | |
Merge tag 'asoc-fix-v5.2-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.2
There's an awful lot of fixes here, almost all for the newly introduced
SoF DSP drivers (including a few things it turned up in shared code).
This is a large and complex piece of code so it's not surprising that
there have been quite a few issues here, fortunately things seem to have
mostly calmed down now. Otherwise there's just a smattering of small fixes.
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 b20eb7fc83eb..fcdf2cd3783b 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -840,7 +840,14 @@ static int snd_hda_codec_dev_free(struct snd_device *device) if (codec->core.type == HDA_DEV_LEGACY) 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; } |