lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25

Browse Source
This commit is contained in:
Paul Mackerras
2008-02-06 22:08:37 +11:00
parent 75e89b02e3 7e25867fe8
commit b370b08274
31 changed files with 190 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/sysdev/fsl_soc.c
View File

@ -1342,7 +1342,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
if (ret)
goto unreg;
ret = platform_device_register(pdev);
ret = platform_device_add(pdev);
if (ret)
goto unreg;

10
arch/powerpc/sysdev/qe_lib/qe.c
View File

@ -66,7 +66,7 @@ phys_addr_t get_qe_base(void)
{
struct device_node *qe;
unsigned int size;
const void *prop;
const u32 *prop;
if (qebase != -1)
return qebase;
@ -79,7 +79,8 @@ phys_addr_t get_qe_base(void)
}
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);
return qebase;
@ -172,10 +173,9 @@ unsigned int get_brg_clk(void)
}
prop = of_get_property(qe, "brg-frequency", &size);
if (!prop || size != sizeof(*prop))
return brg_clk;
if (prop && size == sizeof(*prop))
brg_clk = *prop;
brg_clk = *prop;
of_node_put(qe);
return brg_clk;