Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'tegra-for-4.8-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers
memory: tegra: Changes for v4.8-rc1
Contains three reference count fixes from coccinelle.
* tag 'tegra-for-4.8-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
memory: tegra: mc: Add missing of_node_put()
memory: tegra: Delete unneeded of_node_put()
memory: tegra: tegra124-emc: Add missing of_node_put()
Signed-off-by: Olof Johansson <olof@lixom.net>
+9
-9
+5
-5
drivers/memory/tegra/mc.c
+5
-5
drivers/memory/tegra/mc.c
···
186
186
timing = &mc->timings[i++];
187
187
188
188
err = load_one_timing(mc, timing, child);
189
-
if (err)
189
+
if (err) {
190
+
of_node_put(child);
190
191
return err;
192
+
}
191
193
}
192
194
193
195
return 0;
···
208
206
for_each_child_of_node(mc->dev->of_node, node) {
209
207
err = of_property_read_u32(node, "nvidia,ram-code",
210
208
&node_ram_code);
211
-
if (err || (node_ram_code != ram_code)) {
212
-
of_node_put(node);
209
+
if (err || (node_ram_code != ram_code))
213
210
continue;
214
-
}
215
211
216
212
err = load_timings(mc, node);
213
+
of_node_put(node);
217
214
if (err)
218
215
return err;
219
-
of_node_put(node);
220
216
break;
221
217
}
222
218
+4
-4
drivers/memory/tegra/tegra124-emc.c
+4
-4
drivers/memory/tegra/tegra124-emc.c
···
970
970
timing = &emc->timings[i++];
971
971
972
972
err = load_one_timing_from_dt(emc, timing, child);
973
-
if (err)
973
+
if (err) {
974
+
of_node_put(child);
974
975
return err;
976
+
}
975
977
}
976
978
977
979
sort(emc->timings, emc->num_timings, sizeof(*timing), cmp_timings,
···
997
995
u32 value;
998
996
999
997
err = of_property_read_u32(np, "nvidia,ram-code", &value);
1000
-
if (err || (value != ram_code)) {
1001
-
of_node_put(np);
998
+
if (err || (value != ram_code))
1002
999
continue;
1003
-
}
1004
1000
1005
1001
return np;
1006
1002
}