aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-topology.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-10-02 12:50:40 +0100
committerMark Brown <broonie@kernel.org>2019-10-02 12:50:40 +0100
commit25317997cbcd0497a9460f79c322e0fde0b5b1a9 (patch)
tree215512440bd5a9ce931789d7c0f24d47e7c5d572 /sound/soc/soc-topology.c
parentASoC: SOF: Intel: Add context data to any IPC timeout. (diff)
parentASoC: intel: bytcr_rt5651: add null check to support_button_press (diff)
downloadlinux-dev-25317997cbcd0497a9460f79c322e0fde0b5b1a9.tar.xz
linux-dev-25317997cbcd0497a9460f79c322e0fde0b5b1a9.zip
Merge branch 'asoc-5.4' into asoc-5.5
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 */