Skip to contentSkip to conversation

ASoC: davinci-mcasp: Use a copy of pdata per instance during DT boot

PATCH In review Peter Ujfalusi 2 participants 2 messages Jun 2, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: davinci-mcasp: Use a copy of pdata per instance during DT boot

Instead of modifying the static pdata struct per McASP instance we need to allocate pdata for each McASP.
This way we can avoid configuration leakage from prior McASP to McASP drivers probed at later time.

---
 sound/soc/davinci/davinci-mcasp.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
sound/soc/davinci/davinci-mcasp.c +8 -1
index f8cb3c7d3c45..e10cfda21d89 100644
@@ -1620,7 +1620,14 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of(
 		pdata = pdev->dev.platform_data;
 		return pdata;
 	} else if (match) {
-		pdata = (struct davinci_mcasp_pdata*) match->data;
+		pdata = devm_kmemdup(&pdev->dev, match->data, sizeof(*pdata),
+				     GFP_KERNEL);
+		if (!pdata) {
+			dev_err(&pdev->dev,
+				"Failed to allocate memory for pdata\n");
+			ret = -ENOMEM;
+			return pdata;
+		}
 	} else {
 		/* control shouldn't reach here. something is wrong */
 		ret = -EINVAL;
Signature · 1 line
2.8.3
maintainer
#1 lore raw

Applied "ASoC: davinci-mcasp: Use a copy of pdata per instance during DT boot" to the asoc tree

The patch

ASoC: davinci-mcasp: Use a copy of pdata per instance during DT boot

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 272ee030ebc9da58a5796e6e26f78b77ecce7c21 Mon Sep 17 00:00:00 2001

From: Peter Ujfalusi <[email protected]>
Date: Thu, 2 Jun 2016 12:55:24 +0300
Subject: [PATCH] ASoC: davinci-mcasp: Use a copy of pdata per instance during
DT boot

Instead of modifying the static pdata struct per McASP instance we need to allocate pdata for each McASP.
This way we can avoid configuration leakage from prior McASP to McASP drivers probed at later time.

---
 sound/soc/davinci/davinci-mcasp.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
sound/soc/davinci/davinci-mcasp.c +8 -1
index 237dc67002ef..05c2d33aa74d 100644
@@ -1599,7 +1599,14 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of(
 		pdata = pdev->dev.platform_data;
 		return pdata;
 	} else if (match) {
-		pdata = (struct davinci_mcasp_pdata*) match->data;
+		pdata = devm_kmemdup(&pdev->dev, match->data, sizeof(*pdata),
+				     GFP_KERNEL);
+		if (!pdata) {
+			dev_err(&pdev->dev,
+				"Failed to allocate memory for pdata\n");
+			ret = -ENOMEM;
+			return pdata;
+		}
 	} else {
 		/* control shouldn't reach here. something is wrong */
 		ret = -EINVAL;
Signature · 1 line
2.8.1