[PATCH 4.8 82/92] ASoC: Intel: Skylake: Always acquire runtime pm ref on unload

From: Greg Kroah-Hartman
Date: Thu Nov 17 2016 - 05:37:41 EST

4.8-stable review patch. If anyone has any objections, please let me know.


From: Lukas Wunner <lukas@xxxxxxxxx>

commit 6d13f62d931ba638e54ba56f3a7dd3080ffb485a upstream.

skl_probe() releases a runtime pm ref unconditionally wheras
skl_remove() acquires one only if the device is wakeup capable.
Thus if the device is not wakeup capable, unloading and reloading
the module will result in the refcount being decreased below 0.
Fix it.

Fixes: d8c2dab8381d ("ASoC: Intel: Add Skylake HDA audio driver")
Signed-off-by: Lukas Wunner <lukas@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

sound/soc/intel/skylake/skl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -785,8 +785,7 @@ static void skl_remove(struct pci_dev *p


- if (pci_dev_run_wake(pci))
- pm_runtime_get_noresume(&pci->dev);
+ pm_runtime_get_noresume(&pci->dev);

/* codec removal, invoke bus_device_remove */