Skip to content

fixup! ASoC: SOF: Introduce extended manifest #2095

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
ranj063 merged 1 commit into from
May 12, 2020
Merged

fixup! ASoC: SOF: Introduce extended manifest #2095

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
8 changes: 4 additions & 4 deletions sound/soc/sof/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ static int snd_sof_fw_ext_man_parse(struct snd_sof_dev *sdev,
elem_hdr->size > remaining) {
dev_err(sdev->dev, "error: invalid sof_ext_man header size, type %d size 0x%X\n",
elem_hdr->type, elem_hdr->size);
break;
return -EINVAL;
}

/* process structure data */
Expand All @@ -264,7 +264,7 @@ static int snd_sof_fw_ext_man_parse(struct snd_sof_dev *sdev,
if (ret < 0) {
dev_err(sdev->dev, "error: failed to parse sof_ext_man header type %d size 0x%X\n",
elem_hdr->type, elem_hdr->size);
break;
return ret;
}

remaining -= elem_hdr->size;
Expand All @@ -273,10 +273,10 @@ static int snd_sof_fw_ext_man_parse(struct snd_sof_dev *sdev,

if (remaining) {
dev_err(sdev->dev, "error: sof_ext_man header is inconsistent\n");
ret = -EINVAL;
return -EINVAL;
}

return ret ? ext_man_size : ret;
return ext_man_size;
}

/*
Expand Down