Applied "ASoC: Freescale: Delete an error message for a failed memory allocation in three functions" to the asoc tree
Subsystems (3)
Mark Brown
maintainerThe patch
ASoC: Freescale: Delete an error message for a failed memory allocation in three functions
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
443be77e4b09d98c28196dca7132a1191ecf742bMon Sep 17 00:00:00 2001
From: Markus Elfring <[email protected]>
Date: Fri, 11 Aug 2017 15:10:43 +0200
Subject: [PATCH] ASoC: Freescale: Delete an error message for a failed memory
allocation in three functions
Omit an extra message for a memory allocation failure in these functions.
This issue was detected by using the Coccinelle software.
--- sound/soc/fsl/fsl_asrc_dma.c | 4 +--- sound/soc/fsl/fsl_dma.c | 1 - sound/soc/fsl/fsl_ssi.c | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-)
sound/soc/fsl/fsl_asrc_dma.c +1 -3
@@ -279,10 +279,8 @@ static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream)struct fsl_asrc_pair *pair; pair =kzalloc (sizeof (struct fsl_asrc_pair ),GFP_KERNEL ); -if (!pair) { -dev_err (dev,"failed to allocate pair\n" ); +if (!pair)return -ENOMEM ; - } pair->asrc_priv = asrc_priv;
sound/soc/fsl/fsl_dma.c +0 -1
@@ -905,7 +905,6 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) dma =kzalloc (sizeof (*dma) +strlen (np->full_name),GFP_KERNEL );if (!dma) { -dev_err (&pdev->dev,"could not allocate dma object\n" );of_node_put (ssi_np);return -ENOMEM ; }
sound/soc/fsl/fsl_ssi.c +1 -3
@@ -1432,10 +1432,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) ssi_private =devm_kzalloc (&pdev->dev,sizeof (*ssi_private),GFP_KERNEL ); -if (!ssi_private) { -dev_err (&pdev->dev,"could not allocate DAI object\n" ); +if (!ssi_private)return -ENOMEM ; - } ssi_private->soc = of_id->data; ssi_private->dev = &pdev->dev;
Signature · 1 line
2.13.3