Skip to contentSkip to conversation

ASoC: img-parallel-out: Check pm_runtime_get_sync return code

PATCH In review Ed Blake 2 participants 2 messages Oct 6, 2017 – Oct 9, 2017

Subsystems (2)
lore
Share & tools
lore

Ed Blake

author
#0 lore raw

PATCH 1/1 ASoC: img-parallel-out: Check pm_runtime_get_sync return code

Check the the pm_runtime_get_sync return code and return if an error.

---
 sound/soc/img/img-parallel-out.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/img/img-parallel-out.c +5 -1
index 2fc8a6372206..acc005217be0 100644
@@ -153,6 +153,7 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
 	struct img_prl_out *prl = snd_soc_dai_get_drvdata(dai);
 	u32 reg, control_set = 0;
+	int ret;
 
 	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
 	case SND_SOC_DAIFMT_NB_NF:
@@ -164,7 +165,10 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 		return -EINVAL;
 	}
 
-	pm_runtime_get_sync(prl->dev);
+	ret = pm_runtime_get_sync(prl->dev);
+	if (ret < 0)
+		return ret;
+
 	reg = img_prl_out_readl(prl, IMG_PRL_OUT_CTL);
 	reg = (reg & ~IMG_PRL_OUT_CTL_EDGE_MASK) | control_set;
 	img_prl_out_writel(prl, reg, IMG_PRL_OUT_CTL);
Signature · 1 line
2.11.0
maintainer
#1 lore raw

Applied "ASoC: img-parallel-out: Check pm_runtime_get_sync return code" to the asoc tree

The patch

ASoC: img-parallel-out: Check pm_runtime_get_sync return code

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 596ec4bd958bc7c233d4129072d80272f21e2be1 Mon Sep 17 00:00:00 2001

From: Ed Blake <[email protected]>
Date: Fri, 6 Oct 2017 15:57:50 +0100
Subject: [PATCH] ASoC: img-parallel-out: Check pm_runtime_get_sync return code

Check the the pm_runtime_get_sync return code and return if an error.

---
 sound/soc/img/img-parallel-out.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/img/img-parallel-out.c +5 -1
index 2fc8a6372206..acc005217be0 100644
@@ -153,6 +153,7 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
 	struct img_prl_out *prl = snd_soc_dai_get_drvdata(dai);
 	u32 reg, control_set = 0;
+	int ret;
 
 	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
 	case SND_SOC_DAIFMT_NB_NF:
@@ -164,7 +165,10 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 		return -EINVAL;
 	}
 
-	pm_runtime_get_sync(prl->dev);
+	ret = pm_runtime_get_sync(prl->dev);
+	if (ret < 0)
+		return ret;
+
 	reg = img_prl_out_readl(prl, IMG_PRL_OUT_CTL);
 	reg = (reg & ~IMG_PRL_OUT_CTL_EDGE_MASK) | control_set;
 	img_prl_out_writel(prl, reg, IMG_PRL_OUT_CTL);
Signature · 1 line
2.14.1