mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 20:54:03 +02:00
drivers: omap updates for v7.3
- bus: ti-sysc: Fix /chosen node reference leak -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmpwuDQACgkQWTcYmtP7 xmWckxAAo++yasy20VHwt+nzqVik2HRJG7ryRVCjyXdsHbY2Y8IwcAx34TkfUe4M Dzc6Ysx1RGlvwmq7ErjymjCrKL/oKzTJL1sUFB55mrpeVU6VokWPokW2tXK+jHxV fTjaNLg9V5TXYmS6ifzWWL14/Zmy3V8liwG35rENRIJ79uaI3RWqD+VYJMOYZncc NuuSj2l6RLxagu10PMPFAC0odWZzOXhdZgKrydQYjS7MlbxAqxF22L4p6cfEzRax h5ytOhWyGAZWpw292zx3NkvUnxl0pp2oi4R8KekyBIH6gRwAe8rCZWNdNkGTpbiR rarkSDRoXYiHbJyeuH3qdN1OpZ/CWe1a18zfYAYEaWx3jF+Nx8LcMuEkdASX87pK JOd8p+HZbmw61q8Hqg8+ad1JDYPDcY7ls8sj46sSDtormLZBHL98PAa+W6wBEnxs lD9KOqORRikmraMErSV73DXHST6a3XSNv961oU2lfzEkV5zPDJFKBwqOxVLYa1j9 7EQmOncn5i0PN9p02vcuYrpbXsWkVQOaxgngTEqRIQV+ONRKEHU0FTeKjNC67kMe pJ8kHrS8bFnZJUywBBQh9kiFR4o4Z5X8AC5R5U1XUBRVXyxB1WQ75+a1FB3vxGNY PCTHwzXJ04mW1plRBFTt3MhOOZOJK/lGsii0VtuHP+aB8OeZBhQ= =9bFq -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmpyQtAACgkQmmx57+YA GNkyBRAAuaftydIrcUA7SZ/dsgcnxPnzk1I+BjR8N14oxiv42VKMtyvnTkq8/F9t pKqgpM/mw/kLw5O1js5RdiGw9NyCywW4QWkoNazUEQivkMhmrBjhRDFMf1i+sshQ JEojnF8pOAdtfNZh/gvbCsoBOxhyIgc+cfZ11AwXZftkH+1rICu+ciiariwPw7J4 gV16zSAnpOh2T0gSXwjdhqihI1qbM5iUCAqUxfHIBZGdAL7HmtEHJA1IV9sRqFaj CGXQgyF60bjJqmUju3e7QG2mH4SjcSuuHJX1/VB9y0Rm3u+T5E8Xn+SsljNXisL5 vtqsAYH3DIAxYyYg1ys80U5MPYLHk46Vx1xbWmjD//CcvjNHECbXUqEygN3DUznC JQncf/CDkdmZid7CARtR6+VcsRnm5wJQxo7OEjqKmBBSCUZ1nt+7srFzI4hxNEVg 0qvZaaJY7q+nJ2+gpv7mQ+PSDVSsNoWh+F73O0IGEHaVS5b19578HJUaoCja/mlQ jFW7r3lCJpbFHFXydhgXzdOqAZJeZGSPhAIsHMEWXfq13rNeief7VFu4MY+9uE2+ Rc34JVQJ6Bbhh1CZBy29rIiKnptEcjZZ6d3Qe7rz2lNdH8evZ426lTarHCKmMtOg Lcgi7pyTLeg7HPvFm8B3TWQ20FM90lPFXiO2VbyVfUtDBxSsNos= =wdEr -----END PGP SIGNATURE----- Merge tag 'omap-for-v7.3/drivers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/drivers drivers: omap updates for v7.3 - bus: ti-sysc: Fix /chosen node reference leak * tag 'omap-for-v7.3/drivers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: bus: ti-sysc: Fix /chosen node reference leak Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
67be500fa0
|
|
@ -682,6 +682,7 @@ static struct device_node *stdout_path;
|
|||
|
||||
static void sysc_init_stdout_path(struct sysc *ddata)
|
||||
{
|
||||
struct device_node *chosen;
|
||||
struct device_node *np = NULL;
|
||||
const char *uart;
|
||||
|
||||
|
|
@ -691,15 +692,18 @@ static void sysc_init_stdout_path(struct sysc *ddata)
|
|||
if (stdout_path)
|
||||
return;
|
||||
|
||||
np = of_find_node_by_path("/chosen");
|
||||
if (!np)
|
||||
chosen = of_find_node_by_path("/chosen");
|
||||
if (!chosen)
|
||||
goto err;
|
||||
|
||||
uart = of_get_property(np, "stdout-path", NULL);
|
||||
if (!uart)
|
||||
uart = of_get_property(chosen, "stdout-path", NULL);
|
||||
if (!uart) {
|
||||
of_node_put(chosen);
|
||||
goto err;
|
||||
}
|
||||
|
||||
np = of_find_node_by_path(uart);
|
||||
of_node_put(chosen);
|
||||
if (!np)
|
||||
goto err;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user