Skip to content

Commit

Permalink
sound/soc/mxs/mxs-saif.c: add missing kfree
Browse files Browse the repository at this point in the history
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: Julia Lawall <julia@diku.dk>
Acked-by: Dong Aisheng <b29396@freescale.com>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Julia Lawall authored and Mark Brown committed Aug 22, 2011
1 parent bbe8ff5 commit 0bb98ba
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sound/soc/mxs/mxs-saif.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,12 +521,13 @@ static int mxs_saif_probe(struct platform_device *pdev)
struct mxs_saif *saif;
int ret = 0;

if (pdev->id >= ARRAY_SIZE(mxs_saif))
return -EINVAL;

saif = kzalloc(sizeof(*saif), GFP_KERNEL);
if (!saif)
return -ENOMEM;

if (pdev->id >= ARRAY_SIZE(mxs_saif))
return -EINVAL;
mxs_saif[pdev->id] = saif;

saif->clk = clk_get(&pdev->dev, NULL);
Expand Down

0 comments on commit 0bb98ba

Please sign in to comment.