diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-02-04 08:46:17 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-02-06 00:57:31 -0500 |
commit | d8985fd2b8ef8994399ea33f7e5b24395f5a7cab (patch) | |
tree | 28c9f860e6c17956a14c650de61c51d9c1c2e1cf /arch/powerpc | |
parent | e1664ee9f3dabda088debec12ef5322d8bd8ba01 (diff) |
[POWERPC] qe_lib: fix few fluffy negligences
One is intoduced by me (of_node_put() absence) and another was
present already (not checking for NULL).
Found by Stephen Rothwell.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/sysdev/qe_lib/qe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c index 5ef844da9355..6efbd5e5bb1b 100644 --- a/arch/powerpc/sysdev/qe_lib/qe.c +++ b/arch/powerpc/sysdev/qe_lib/qe.c | |||
@@ -66,7 +66,7 @@ phys_addr_t get_qe_base(void) | |||
66 | { | 66 | { |
67 | struct device_node *qe; | 67 | struct device_node *qe; |
68 | unsigned int size; | 68 | unsigned int size; |
69 | const void *prop; | 69 | const u32 *prop; |
70 | 70 | ||
71 | if (qebase != -1) | 71 | if (qebase != -1) |
72 | return qebase; | 72 | return qebase; |
@@ -79,7 +79,8 @@ phys_addr_t get_qe_base(void) | |||
79 | } | 79 | } |
80 | 80 | ||
81 | prop = of_get_property(qe, "reg", &size); | 81 | prop = of_get_property(qe, "reg", &size); |
82 | qebase = of_translate_address(qe, prop); | 82 | if (prop && size >= sizeof(*prop)) |
83 | qebase = of_translate_address(qe, prop); | ||
83 | of_node_put(qe); | 84 | of_node_put(qe); |
84 | 85 | ||
85 | return qebase; | 86 | return qebase; |
@@ -172,10 +173,9 @@ unsigned int get_brg_clk(void) | |||
172 | } | 173 | } |
173 | 174 | ||
174 | prop = of_get_property(qe, "brg-frequency", &size); | 175 | prop = of_get_property(qe, "brg-frequency", &size); |
175 | if (!prop || size != sizeof(*prop)) | 176 | if (prop && size == sizeof(*prop)) |
176 | return brg_clk; | 177 | brg_clk = *prop; |
177 | 178 | ||
178 | brg_clk = *prop; | ||
179 | of_node_put(qe); | 179 | of_node_put(qe); |
180 | 180 | ||
181 | return brg_clk; | 181 | return brg_clk; |