提交 d8985fd2 编写于 作者: A Anton Vorontsov 提交者: Kumar Gala

[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: NAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: NStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
上级 e1664ee9
...@@ -66,7 +66,7 @@ phys_addr_t get_qe_base(void) ...@@ -66,7 +66,7 @@ phys_addr_t get_qe_base(void)
{ {
struct device_node *qe; struct device_node *qe;
unsigned int size; unsigned int size;
const void *prop; const u32 *prop;
if (qebase != -1) if (qebase != -1)
return qebase; return qebase;
...@@ -79,7 +79,8 @@ phys_addr_t get_qe_base(void) ...@@ -79,7 +79,8 @@ phys_addr_t get_qe_base(void)
} }
prop = of_get_property(qe, "reg", &size); prop = of_get_property(qe, "reg", &size);
qebase = of_translate_address(qe, prop); if (prop && size >= sizeof(*prop))
qebase = of_translate_address(qe, prop);
of_node_put(qe); of_node_put(qe);
return qebase; return qebase;
...@@ -172,10 +173,9 @@ unsigned int get_brg_clk(void) ...@@ -172,10 +173,9 @@ unsigned int get_brg_clk(void)
} }
prop = of_get_property(qe, "brg-frequency", &size); prop = of_get_property(qe, "brg-frequency", &size);
if (!prop || size != sizeof(*prop)) if (prop && size == sizeof(*prop))
return brg_clk; brg_clk = *prop;
brg_clk = *prop;
of_node_put(qe); of_node_put(qe);
return brg_clk; return brg_clk;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册