| Message ID | 1383793720-4643-5-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/11/2013 04:08, Jisheng Zhang wrote: > Add of_node_put to properly decrement the refcount when we are > done using a given node. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Thanks, Gregory > --- > drivers/bus/mvebu-mbus.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c > index 33c6947..20da90f 100644 > --- a/drivers/bus/mvebu-mbus.c > +++ b/drivers/bus/mvebu-mbus.c > @@ -837,6 +837,7 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base, > { > struct mvebu_mbus_state *mbus = &mbus_state; > const struct of_device_id *of_id; > + struct device_node *np; > int win; > > for (of_id = of_mvebu_mbus_ids; of_id->compatible; of_id++) > @@ -860,8 +861,11 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base, > return -ENOMEM; > } > > - if (of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric")) > + np = of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric"); > + if (np) { > mbus->hw_io_coherency = 1; > + of_node_put(np); > + } > > for (win = 0; win < mbus->soc->num_wins; win++) > mvebu_mbus_disable_window(mbus, win); >
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 33c6947..20da90f 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -837,6 +837,7 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base, { struct mvebu_mbus_state *mbus = &mbus_state; const struct of_device_id *of_id; + struct device_node *np; int win; for (of_id = of_mvebu_mbus_ids; of_id->compatible; of_id++) @@ -860,8 +861,11 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base, return -ENOMEM; } - if (of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric")) + np = of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric"); + if (np) { mbus->hw_io_coherency = 1; + of_node_put(np); + } for (win = 0; win < mbus->soc->num_wins; win++) mvebu_mbus_disable_window(mbus, win);