Skip to content

Remove always true condition in msgs #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Aug 15, 2018
Merged

Remove always true condition in msgs #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions sound/soc/sof/topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,8 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,

dev_dbg(sdev->dev, "tplg: ready widget id %d pipe %d type %d name : %s stream %s\n",
swidget->comp_id, index, swidget->id, tw->name,
tw->sname ? tw->sname : "none");
strnlen(tw->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) > 0
? tw->sname : "none");

/* handle any special case widgets */
switch (w->id) {
Expand Down Expand Up @@ -1419,7 +1420,8 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
dev_err(sdev->dev,
"error: DSP failed to add widget id %d type %d name : %s stream %s reply %d\n",
tw->shift, swidget->id, tw->name,
tw->sname ? tw->sname : "none", reply.rhdr.error);
strnlen(tw->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) > 0
? tw->sname : "none", reply.rhdr.error);
kfree(swidget);
return ret;
}
Expand Down