aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/soc/sof/sof-client-ipc-msg-injector.c15
-rw-r--r--sound/soc/ux500/mop500_ab8500.c9
2 files changed, 14 insertions, 10 deletions
diff --git a/sound/soc/sof/sof-client-ipc-msg-injector.c b/sound/soc/sof/sof-client-ipc-msg-injector.c
index c2480317730c..03490a4d4ae7 100644
--- a/sound/soc/sof/sof-client-ipc-msg-injector.c
+++ b/sound/soc/sof/sof-client-ipc-msg-injector.c
@@ -76,12 +76,17 @@ static ssize_t sof_msg_inject_ipc4_dfs_read(struct file *file,
struct sof_client_dev *cdev = file->private_data;
struct sof_msg_inject_priv *priv = cdev->data;
struct sof_ipc4_msg *ipc4_msg = priv->rx_buffer;
+ size_t header_size = sizeof(ipc4_msg->header_u64);
size_t remaining;
if (!ipc4_msg->header_u64 || !count || *ppos)
return 0;
- remaining = sizeof(ipc4_msg->header_u64);
+ /* we need space for the header at minimum (u64) */
+ if (count < header_size)
+ return -ENOSPC;
+
+ remaining = header_size;
/* Only get large config have payload */
if (SOF_IPC4_MSG_IS_MODULE_MSG(ipc4_msg->primary) &&
@@ -90,13 +95,15 @@ static ssize_t sof_msg_inject_ipc4_dfs_read(struct file *file,
if (count > remaining)
count = remaining;
+ else if (count < remaining)
+ remaining = count;
/* copy the header first */
- if (copy_to_user(buffer, &ipc4_msg->header_u64, sizeof(ipc4_msg->header_u64)))
+ if (copy_to_user(buffer, &ipc4_msg->header_u64, header_size))
return -EFAULT;
- *ppos += sizeof(ipc4_msg->header_u64);
- remaining -= sizeof(ipc4_msg->header_u64);
+ *ppos += header_size;
+ remaining -= header_size;
if (!remaining)
return count;
diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c
index 3e654e708f78..1ea1729984a9 100644
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -433,12 +433,9 @@ void mop500_ab8500_remove(struct snd_soc_card *card)
{
struct mop500_ab8500_drvdata *drvdata = snd_soc_card_get_drvdata(card);
- if (drvdata->clk_ptr_sysclk != NULL)
- clk_put(drvdata->clk_ptr_sysclk);
- if (drvdata->clk_ptr_ulpclk != NULL)
- clk_put(drvdata->clk_ptr_ulpclk);
- if (drvdata->clk_ptr_intclk != NULL)
- clk_put(drvdata->clk_ptr_intclk);
+ clk_put(drvdata->clk_ptr_sysclk);
+ clk_put(drvdata->clk_ptr_ulpclk);
+ clk_put(drvdata->clk_ptr_intclk);
snd_soc_card_set_drvdata(card, drvdata);
}