On 20/08/11 08:02, Julia Lawall wrote:

From: Julia Lawall julia@diku.dk

dma_channel_np has been accessed at this point, so decrease its reference count before leaving the function.

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 != of_node_put(x) when != x = E3 when != E3 = x

• return ...;

} ... when != x = E2 when != I(...,x,...) S if (...) { ... when != x = E4 of_node_put(x); ... return ...; } ) // </smpl>

Signed-off-by: Julia Lawall julia@diku.dk

---

sound/soc/fsl/p1022_ds.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 8fa4d5f..fcb862e 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -297,8 +297,10 @@ static int get_dma_channel(struct device_node *ssi_np, * dai->platform name should already point to an allocated buffer. */ ret = of_address_to_resource(dma_channel_np, 0, &res);

• if (ret)

• if (ret) {

• of_node_put(dma_channel_np);
  

  return ret;
• } snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s", (unsigned long long) res.start, dma_channel_np->name);

Both

Acked-by: Liam Girdwood lrg@ti.com