diff options
-rw-r--r-- | sound/soc/sof/topology.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 0aabb3190ddc..4452594c2e17 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c | |||
@@ -543,15 +543,16 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp, | |||
543 | struct soc_bytes_ext *sbe = (struct soc_bytes_ext *)kc->private_value; | 543 | struct soc_bytes_ext *sbe = (struct soc_bytes_ext *)kc->private_value; |
544 | int max_size = sbe->max; | 544 | int max_size = sbe->max; |
545 | 545 | ||
546 | if (le32_to_cpu(control->priv.size) > max_size) { | 546 | /* init the get/put bytes data */ |
547 | scontrol->size = sizeof(struct sof_ipc_ctrl_data) + | ||
548 | le32_to_cpu(control->priv.size); | ||
549 | |||
550 | if (scontrol->size > max_size) { | ||
547 | dev_err(sdev->dev, "err: bytes data size %d exceeds max %d.\n", | 551 | dev_err(sdev->dev, "err: bytes data size %d exceeds max %d.\n", |
548 | control->priv.size, max_size); | 552 | scontrol->size, max_size); |
549 | return -EINVAL; | 553 | return -EINVAL; |
550 | } | 554 | } |
551 | 555 | ||
552 | /* init the get/put bytes data */ | ||
553 | scontrol->size = sizeof(struct sof_ipc_ctrl_data) + | ||
554 | le32_to_cpu(control->priv.size); | ||
555 | scontrol->control_data = kzalloc(max_size, GFP_KERNEL); | 556 | scontrol->control_data = kzalloc(max_size, GFP_KERNEL); |
556 | cdata = scontrol->control_data; | 557 | cdata = scontrol->control_data; |
557 | if (!scontrol->control_data) | 558 | if (!scontrol->control_data) |