diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-02 16:53:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-02 16:53:35 +0100 |
| commit | 04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491 (patch) | |
| tree | 062e082e19ab94a4ca7bc60286df970debdd2d6f /lib/assoc_array.c | |
| parent | ASoC: simple-card: tidyup get dai_link/dai_props from priv (diff) | |
| parent | Linux 3.17-rc4 (diff) | |
| download | linux-04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491.tar.gz linux-04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491.zip | |
Merge tag 'v3.17-rc4' into asoc-simple
Linux 3.17-rc4
Diffstat (limited to 'lib/assoc_array.c')
| -rw-r--r-- | lib/assoc_array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c index c0b1007011e1..ae146f0734eb 100644 --- a/lib/assoc_array.c +++ b/lib/assoc_array.c @@ -1735,7 +1735,7 @@ ascend_old_tree: gc_complete: edit->set[0].to = new_root; assoc_array_apply_edit(edit); - edit->array->nr_leaves_on_tree = nr_leaves_on_tree; + array->nr_leaves_on_tree = nr_leaves_on_tree; return 0; enomem: |