Skip to content

Fix/i386 compilation take2 #2413

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
kv2019i merged 2 commits into from
Sep 1, 2020
Merged

Fix/i386 compilation take2 #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff5dc2f
fixup! ASoC: SOF: Implement snd_sof_bytes_ext_volatile_get kcontrol IO
plbossart Aug 31, 2020
e6a2ab3
fixup! ASoC: SOF: fix range checks
plbossart Aug 31, 2020
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/control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ int snd_sof_bytes_get(struct snd_kcontrol *kcontrol,
if (data->size > be->max - sizeof(*data)) {
dev_err_ratelimited(scomp->dev,
"error: %u bytes of control data is invalid, max is %zu\n",
data->size, (size_t)be->max - sizeof(*data));
data->size, be->max - sizeof(*data));
return -EINVAL;
}

Expand Down Expand Up @@ -267,7 +267,7 @@ int snd_sof_bytes_put(struct snd_kcontrol *kcontrol,
if (data->size > be->max - sizeof(*data)) {
dev_err_ratelimited(scomp->dev,
"error: data size too big %u bytes max is %zu\n",
data->size, (size_t)be->max - sizeof(*data));
data->size, be->max - sizeof(*data));
return -EINVAL;
}

Expand Down Expand Up @@ -390,7 +390,7 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _
if (cdata->data->size > be->max - sizeof(const struct sof_abi_hdr)) {
dev_err_ratelimited(scomp->dev, "error: user data size %d exceeds max size %zu.\n",
cdata->data->size,
(size_t)be->max - sizeof(const struct sof_abi_hdr));
be->max - sizeof(const struct sof_abi_hdr));
ret = -EINVAL;
goto out;
}
Expand Down Expand Up @@ -443,7 +443,7 @@ int snd_sof_bytes_ext_get(struct snd_kcontrol *kcontrol,
if (cdata->data->size > be->max - sizeof(const struct sof_abi_hdr)) {
dev_err_ratelimited(scomp->dev, "error: user data size %d exceeds max size %zu.\n",
cdata->data->size,
(size_t)be->max - sizeof(const struct sof_abi_hdr));
be->max - sizeof(const struct sof_abi_hdr));
return -EINVAL;
}

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,7 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp,
/* init the get/put bytes data */
if (priv_size > max_size - sizeof(struct sof_ipc_ctrl_data)) {
dev_err(scomp->dev, "err: bytes data size %zu exceeds max %zu.\n",
priv_size, (size_t)max_size - sizeof(struct sof_ipc_ctrl_data));
priv_size, max_size - sizeof(struct sof_ipc_ctrl_data));
ret = -EINVAL;
goto out;
}
Expand Down