summaryrefslogtreecommitdiffstats
path: root/sound/hda/hdac_device.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2020-09-17 20:45:05 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-09-17 20:45:05 +0200
commit056c1722014104b70d36fe71b683f71637f1a708 (patch)
tree8236ab2e3f32d9dd2f82ca6045a6f82bd1b0d1e9 /sound/hda/hdac_device.c
parentperf tests: Call test_attr__open() directly (diff)
parentMerge tag 'perf-tools-fixes-for-v5.9-2020-09-16' of git://git.kernel.org/pub/... (diff)
downloadlinux-056c1722014104b70d36fe71b683f71637f1a708.tar.xz
linux-056c1722014104b70d36fe71b683f71637f1a708.zip
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'sound/hda/hdac_device.c')
-rw-r--r--sound/hda/hdac_device.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c
index 333220f0f8af..3e9e9ac804f6 100644
--- a/sound/hda/hdac_device.c
+++ b/sound/hda/hdac_device.c
@@ -127,6 +127,8 @@ EXPORT_SYMBOL_GPL(snd_hdac_device_init);
void snd_hdac_device_exit(struct hdac_device *codec)
{
pm_runtime_put_noidle(&codec->dev);
+ /* keep balance of runtime PM child_count in parent device */
+ pm_runtime_set_suspended(&codec->dev);
snd_hdac_bus_remove_device(codec->bus, codec);
kfree(codec->vendor_name);
kfree(codec->chip_name);