diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-02-04 21:13:15 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-02-06 00:30:00 -0500 |
commit | c6d01179bfee3048cce98fe303d7265faa3861a7 (patch) | |
tree | 216faf6fffd748b761abd4feec307f5b3020e9dd /arch/powerpc | |
parent | de4c928b843063b7079c35c950c1d38c559fa0cb (diff) |
[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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/cell/axon_msi.c | 2 |
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 b9a97c4ae15a..d95e71dee91f 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) | |||
137 | 137 | ||
138 | tmp = dn; | 138 | tmp = dn; |
139 | dn = of_find_node_by_phandle(*ph); | 139 | dn = of_find_node_by_phandle(*ph); |
140 | of_node_put(tmp); | ||
140 | if (!dn) { | 141 | if (!dn) { |
141 | dev_dbg(&dev->dev, | 142 | dev_dbg(&dev->dev, |
142 | "axon_msi: msi-translator doesn't point to a node\n"); | 143 | "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) | |||
154 | 155 | ||
155 | out_error: | 156 | out_error: |
156 | of_node_put(dn); | 157 | of_node_put(dn); |
157 | of_node_put(tmp); | ||
158 | 158 | ||
159 | return msic; | 159 | return msic; |
160 | } | 160 | } |