Commit 0bb98ba2 authored by Julia Lawall's avatar Julia Lawall Committed by Mark Brown

sound/soc/mxs/mxs-saif.c: add missing kfree

Move the test on pdev->id before the kzalloc to avoid requiring kfree when
the test fails.  This fix was suggested by Wolfram Sang.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
identifier x;
expression E1!=0,E2,E3,E4;
statement S;
iterator I;
@@

(
if (...) { ... when != kfree(x)
               when != x = E3
               when != E3 = x
*  return ...;
 }
... when != x = E2
    when != I(...,x,...) S
if (...) { ... when != x = E4
 kfree(x); ... return ...; }
)
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Acked-by: default avatarDong Aisheng <b29396@freescale.com>
Reviewed-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bbe8ff5e
...@@ -521,12 +521,13 @@ static int mxs_saif_probe(struct platform_device *pdev) ...@@ -521,12 +521,13 @@ static int mxs_saif_probe(struct platform_device *pdev)
struct mxs_saif *saif; struct mxs_saif *saif;
int ret = 0; int ret = 0;
if (pdev->id >= ARRAY_SIZE(mxs_saif))
return -EINVAL;
saif = kzalloc(sizeof(*saif), GFP_KERNEL); saif = kzalloc(sizeof(*saif), GFP_KERNEL);
if (!saif) if (!saif)
return -ENOMEM; return -ENOMEM;
if (pdev->id >= ARRAY_SIZE(mxs_saif))
return -EINVAL;
mxs_saif[pdev->id] = saif; mxs_saif[pdev->id] = saif;
saif->clk = clk_get(&pdev->dev, NULL); saif->clk = clk_get(&pdev->dev, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment