diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
commit | d61b04f801e6005182d432ebe4a0211c1d6feadd (patch) | |
tree | aa085e56e1be528917212f41c485eebdfc072930 /sound/soc/intel/skylake/skl.c | |
parent | 30ff5957c3f1887d04ca01d839dc382739e48bde (diff) | |
parent | 473f414564528a819f0c2bb6b4bf26366b64c9ab (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/soc/intel/skylake/skl.c')
-rw-r--r-- | sound/soc/intel/skylake/skl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 443a15de94b5..092705e73db4 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -614,8 +614,6 @@ static int skl_probe(struct pci_dev *pci, goto out_unregister; /*configure PM */ - pm_runtime_set_autosuspend_delay(bus->dev, SKL_SUSPEND_DELAY); - pm_runtime_use_autosuspend(bus->dev); pm_runtime_put_noidle(bus->dev); pm_runtime_allow(bus->dev); |