git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
intel
/
skylake
/
skl-pcm.c
diff --git
a/sound/soc/intel/skylake/skl-pcm.c
b/sound/soc/intel/skylake/skl-pcm.c
index 2b1e513b1680e4c73130710c318e8fe50855c59c..a3cb204e9640fa36052bb2caf685ac465e051262 100644
(file)
--- a/
sound/soc/intel/skylake/skl-pcm.c
+++ b/
sound/soc/intel/skylake/skl-pcm.c
@@
-355,7
+355,8
@@
static void skl_pcm_close(struct snd_pcm_substream *substream,
}
mconfig = skl_tplg_fe_get_cpr_module(dai, substream->stream);
- skl_tplg_d0i3_put(skl, mconfig->d0i3_caps);
+ if (mconfig)
+ skl_tplg_d0i3_put(skl, mconfig->d0i3_caps);
kfree(dma_params);
}