diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-08-05 11:18:22 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-08-05 11:20:09 +0000 |
| commit | 088eef2219bd1e8cb82bfcb5b32c1c687aeea6d7 (patch) | |
| tree | ed5bc8f678f2c0dff70012fcd9d2a601e80991d7 /drivers/of/base.c | |
| parent | 741ddbcfd26f192b0677961385b599aa785f8119 (diff) | |
| parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) | |
| download | linux-088eef2219bd1e8cb82bfcb5b32c1c687aeea6d7.tar.gz linux-088eef2219bd1e8cb82bfcb5b32c1c687aeea6d7.tar.bz2 linux-088eef2219bd1e8cb82bfcb5b32c1c687aeea6d7.zip | |
Merging v3.10-rc2 as I need to apply a fix for
3cc8e40e8ff8e232a9dd672da81beabd09f87366
"xen/arm: rename xen_secondary_init and run it on every online cpu"
The commit is in v3.10-rc2, the current branch is based on v3.10-rc1.
Diffstat (limited to 'drivers/of/base.c')
| -rw-r--r-- | drivers/of/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index c76d16c972cc..f53b992f060a 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1208,11 +1208,11 @@ static int __of_parse_phandle_with_args(const struct device_node *np, out_args->args_count = count; for (i = 0; i < count; i++) out_args->args[i] = be32_to_cpup(list++); + } else { + of_node_put(node); } /* Found it! return success */ - if (node) - of_node_put(node); return 0; } |