From mboxrd@z Thu Jan  1 00:00:00 1970
From: Liam Girdwood <lrg@ti.com>
Subject: Re: [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing
	of_node_put
Date: Mon, 22 Aug 2011 11:18:17 +0100
Message-ID: <4E522CE9.7050102@ti.com>
References: <1313823721-16930-1-git-send-email-julia@diku.dk>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
In-Reply-To: <1313823721-16930-1-git-send-email-julia@diku.dk>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Sender: alsa-devel-bounces@alsa-project.org
Errors-To: alsa-devel-bounces@alsa-project.org
To: Julia Lawall <julia@diku.dk>
Cc: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>, Takashi Iwai <tiwai@suse.de>, "devicetree-discuss@lists.ozlabs.org" <devicetree-discuss@lists.ozlabs.org>, Brown <broonie@opensource.wolfsonmicro.com>, "kernel-janitors@vger.kernel.org" <kernel-janitors@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Grant Likely <grant.likely@secretlab.ca>, Axel Lin <axel.lin@gmail.com>, Mark@alsa-project.org, Timur Tabi <timur@freescale.com>
List-Id: devicetree@vger.kernel.org

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>