Merge tag 'asoc-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[sfrench/cifs-2.6.git] / sound / soc / sof / topology.c

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index bcdb499c96a02261a155201c8a604667d29aeb1e..da182314aa8745a06084acfb09ab1a5c91fedde6 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -3,7 +3,7 @@
 // This file is provided under a dual BSD/GPLv2 license.  When using or
 // redistributing this file, you may do so under either license.
 //
-// Copyright(c) 2018 Intel Corporation. All rights reserved.
+// Copyright(c) 2018 Intel Corporation
 //
 // Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
 //
@@ -1531,10 +1531,9 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
        /* check token parsing reply */
        if (ret < 0) {
                dev_err(scomp->dev,
-                       "error: failed to add widget id %d type %d name : %s stream %s\n",
-                       tw->shift, swidget->id, tw->name,
-                       strnlen(tw->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) > 0
-                               ? tw->sname : "none");
+                       "failed to add widget type %d name : %s stream %s\n",
+                       swidget->id, tw->name, strnlen(tw->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) > 0
+                                                       ? tw->sname : "none");
                goto widget_free;
        }