| Message ID | 1314022961-27513-1-git-send-email-timur@freescale.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 22/08/11 15:22, Timur Tabi wrote: > of_parse_phandle increments the reference count of np, so this should be > decremented before trying the next possibility. > > Since we don't actually use np, we can decrement the reference count > immediately. > > Reported-by: Julia Lawall <julia@diku.dk> > Signed-off-by: Timur Tabi <timur@freescale.com> Acked-by: Liam Girdwood <lrg@ti.com> > --- > sound/soc/fsl/fsl_dma.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c > index 6680c0b..b300f4b 100644 > --- a/sound/soc/fsl/fsl_dma.c > +++ b/sound/soc/fsl/fsl_dma.c > @@ -877,10 +877,12 @@ static struct device_node *find_ssi_node(struct device_node *dma_channel_np) > * assume that device_node pointers are a valid comparison. > */ > np = of_parse_phandle(ssi_np, "fsl,playback-dma", 0); > + of_node_put(np); > if (np == dma_channel_np) > return ssi_np; > > np = of_parse_phandle(ssi_np, "fsl,capture-dma", 0); > + of_node_put(np); > if (np == dma_channel_np) > return ssi_np; > }
On Mon, Aug 22, 2011 at 09:22:41AM -0500, Timur Tabi wrote: > of_parse_phandle increments the reference count of np, so this should be > decremented before trying the next possibility. > > Since we don't actually use np, we can decrement the reference count > immediately. Applied, thanks.
On Mon, Aug 22, 2011 at 09:22:41AM -0500, Timur Tabi wrote: > of_parse_phandle increments the reference count of np, so this should be > decremented before trying the next possibility. > > Since we don't actually use np, we can decrement the reference count > immediately. Applied, thanks.
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 6680c0b..b300f4b 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -877,10 +877,12 @@ static struct device_node *find_ssi_node(struct device_node *dma_channel_np) * assume that device_node pointers are a valid comparison. */ np = of_parse_phandle(ssi_np, "fsl,playback-dma", 0); + of_node_put(np); if (np == dma_channel_np) return ssi_np; np = of_parse_phandle(ssi_np, "fsl,capture-dma", 0); + of_node_put(np); if (np == dma_channel_np) return ssi_np; }
of_parse_phandle increments the reference count of np, so this should be decremented before trying the next possibility. Since we don't actually use np, we can decrement the reference count immediately. Reported-by: Julia Lawall <julia@diku.dk> Signed-off-by: Timur Tabi <timur@freescale.com> --- sound/soc/fsl/fsl_dma.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)