projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f08cbd
38c079e
)
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Mark Brown
<broonie@kernel.org>
Mon, 8 Feb 2016 16:44:12 +0000
(16:44 +0000)
committer
Mark Brown
<broonie@kernel.org>
Mon, 8 Feb 2016 16:44:12 +0000
(16:44 +0000)
1
2
sound/soc/intel/skylake/skl-pcm.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/soc/intel/skylake/skl-topology.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/soc/intel/skylake/skl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/soc/intel/skylake/skl-pcm.c
Simple merge
diff --cc
sound/soc/intel/skylake/skl-topology.c
index
4624556
,
4898486
..
a294fee
---
1
/
sound/soc/intel/skylake/skl-topology.c
---
2
/
sound/soc/intel/skylake/skl-topology.c
+++ b/
sound/soc/intel/skylake/skl-topology.c
@@@
-1508,8
-1536,10
+1536,9
@@@
int skl_tplg_init(struct snd_soc_platfo
*/
ret = snd_soc_tplg_component_load(&platform->component,
&skl_tplg_ops, fw, 0);
- release_firmware(fw);
if (ret < 0) {
dev_err(bus->dev, "tplg component load failed%d\n", ret);
+ release_firmware(fw);
return -EINVAL;
}
diff --cc
sound/soc/intel/skylake/skl.c
Simple merge