summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-02-05 13:13:15 +1100
committerPaul Mackerras <paulus@samba.org>2008-02-06 16:30:00 +1100
commitc6d01179bfee3048cce98fe303d7265faa3861a7 (patch)
tree216faf6fffd748b761abd4feec307f5b3020e9dd
parentde4c928b843063b7079c35c950c1d38c559fa0cb (diff)
downloadop-kernel-dev-c6d01179bfee3048cce98fe303d7265faa3861a7.zip
op-kernel-dev-c6d01179bfee3048cce98fe303d7265faa3861a7.tar.gz
[POWERPC] Avoid possible extra of_node_put in axon_msi.c
I got this warning from gcc: arch/powerpc/platforms/cell/axon_msi.c:118: warning: 'tmp' may be used uninitialized in this function Which turns out to be a false positive, but pointed out that it was possible for the error path in find_msi_translator() to do an extra of_node_put on a node. This fixes it by localising the ref counting a bit. As a side effect, the warning goes away. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/cell/axon_msi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index b9a97c4..d95e71d 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -137,6 +137,7 @@ static struct axon_msic *find_msi_translator(struct pci_dev *dev)
tmp = dn;
dn = of_find_node_by_phandle(*ph);
+ of_node_put(tmp);
if (!dn) {
dev_dbg(&dev->dev,
"axon_msi: msi-translator doesn't point to a node\n");
@@ -154,7 +155,6 @@ static struct axon_msic *find_msi_translator(struct pci_dev *dev)
out_error:
of_node_put(dn);
- of_node_put(tmp);
return msic;
}
OpenPOWER on IntegriCloud