aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/fsl/fsl_asrc_dma.c4
-rw-r--r--sound/soc/fsl/fsl_dma.c1
-rw-r--r--sound/soc/fsl/fsl_ssi.c4
3 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
index 282d841840b1..2baf19608bd0 100644
--- a/sound/soc/fsl/fsl_asrc_dma.c
+++ b/sound/soc/fsl/fsl_asrc_dma.c
@@ -279,10 +279,8 @@ static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream)
279 struct fsl_asrc_pair *pair; 279 struct fsl_asrc_pair *pair;
280 280
281 pair = kzalloc(sizeof(struct fsl_asrc_pair), GFP_KERNEL); 281 pair = kzalloc(sizeof(struct fsl_asrc_pair), GFP_KERNEL);
282 if (!pair) { 282 if (!pair)
283 dev_err(dev, "failed to allocate pair\n");
284 return -ENOMEM; 283 return -ENOMEM;
285 }
286 284
287 pair->asrc_priv = asrc_priv; 285 pair->asrc_priv = asrc_priv;
288 286
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 979ed1b3ecc4..c17359648915 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -905,7 +905,6 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)
905 905
906 dma = kzalloc(sizeof(*dma) + strlen(np->full_name), GFP_KERNEL); 906 dma = kzalloc(sizeof(*dma) + strlen(np->full_name), GFP_KERNEL);
907 if (!dma) { 907 if (!dma) {
908 dev_err(&pdev->dev, "could not allocate dma object\n");
909 of_node_put(ssi_np); 908 of_node_put(ssi_np);
910 return -ENOMEM; 909 return -ENOMEM;
911 } 910 }
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 173cb8496641..64598d1183f8 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1432,10 +1432,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
1432 1432
1433 ssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private), 1433 ssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private),
1434 GFP_KERNEL); 1434 GFP_KERNEL);
1435 if (!ssi_private) { 1435 if (!ssi_private)
1436 dev_err(&pdev->dev, "could not allocate DAI object\n");
1437 return -ENOMEM; 1436 return -ENOMEM;
1438 }
1439 1437
1440 ssi_private->soc = of_id->data; 1438 ssi_private->soc = of_id->data;
1441 ssi_private->dev = &pdev->dev; 1439 ssi_private->dev = &pdev->dev;