git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
pfunc_core.c
diff --git
a/arch/powerpc/platforms/powermac/pfunc_core.c
b/arch/powerpc/platforms/powermac/pfunc_core.c
index
cec6359
..
b0c3777
100644
(file)
--- a/
arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/
arch/powerpc/platforms/powermac/pfunc_core.c
@@
-837,8
+837,10
@@
struct pmf_function *__pmf_find_function(struct device_node *target,
return NULL;
find_it:
dev = pmf_find_device(actor);
return NULL;
find_it:
dev = pmf_find_device(actor);
- if (dev == NULL)
- return NULL;
+ if (dev == NULL) {
+ result = NULL;
+ goto out;
+ }
list_for_each_entry(func, &dev->functions, link) {
if (name && strcmp(name, func->name))
list_for_each_entry(func, &dev->functions, link) {
if (name && strcmp(name, func->name))
@@
-850,8
+852,9
@@
struct pmf_function *__pmf_find_function(struct device_node *target,
result = func;
break;
}
result = func;
break;
}
- of_node_put(actor);
pmf_put_device(dev);
pmf_put_device(dev);
+out:
+ of_node_put(actor);
return result;
}
return result;
}