summaryrefslogtreecommitdiff
path: root/sound/soc/soc-topology.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-10-21 14:05:26 +0200
committerTakashi Iwai <tiwai@suse.de>2019-10-21 14:05:26 +0200
commitc8d2dcb3e94106395811ac86681a4439c560cbca (patch)
tree8bcb8096565bef5a8470e7acb1979673bc8c8c68 /sound/soc/soc-topology.c
parent83629532ce45ef9df1f297b419b9ea112045685d (diff)
parent95a32c98055f664f9b3f34c41e153d4dcedd0eff (diff)
Merge tag 'asoc-fix-v5.4-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.4 A collection of fixes that have arrived since the merge window. There are a small number of core fixes here but they are smaller ones around error handling.
Diffstat (limited to 'sound/soc/soc-topology.c')
-rw-r--r--sound/soc/soc-topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index aa9a1fca46fa..0fd032914a31 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1582,7 +1582,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
/* map user to kernel widget ID */
template.id = get_widget_id(le32_to_cpu(w->id));
- if (template.id < 0)
+ if ((int)template.id < 0)
return template.id;
/* strings are allocated here, but used and freed by the widget */