diff options
| author | Rob Herring <robh@kernel.org> | 2014-01-18 02:01:27 +0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-01-18 02:01:27 +0400 |
| commit | 361128fcbf30f590a05c8e8789155364f37367db (patch) | |
| tree | 7f7973599e286dfd48ea724a5b7fb4bca76b294e /drivers/of/irq.c | |
| parent | e2897d7e0b0460dca91b52d55ce41c888363502d (diff) | |
| parent | 482c43419fc204b4b658fa4acb80cd502e5fcbac (diff) | |
| download | linux-361128fcbf30f590a05c8e8789155364f37367db.tar.xz | |
Merge remote-tracking branch 'grant/devicetree/next' into for-3.14
Diffstat (limited to 'drivers/of/irq.c')
| -rw-r--r-- | drivers/of/irq.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index bf8026895c5e..9bcf2cf19357 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -165,7 +165,6 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq) if (of_get_property(ipar, "interrupt-controller", NULL) != NULL) { pr_debug(" -> got it !\n"); - of_node_put(old); return 0; } @@ -253,8 +252,7 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq) * Successfully parsed an interrrupt-map translation; copy new * interrupt specifier into the out_irq structure */ - of_node_put(out_irq->np); - out_irq->np = of_node_get(newpar); + out_irq->np = newpar; match_array = imap - newaddrsize - newintsize; for (i = 0; i < newintsize; i++) @@ -271,7 +269,6 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq) } fail: of_node_put(ipar); - of_node_put(out_irq->np); of_node_put(newpar); return -EINVAL; |