diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-11 21:40:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-11 21:40:20 +0100 |
| commit | cd618339b4e2df41c557f9a08842f2cf14f7d5a1 (patch) | |
| tree | 8eb40809e3cdf311d22a38d8e45f043bef0e9cb7 | |
| parent | bc82f44f2f249768e885f487144257d400fd86d5 (diff) | |
| parent | 36f1219407f4f54585bcec8ca4514d2ae07287e3 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
| -rw-r--r-- | arch/arm/plat-samsung/s5p-dev-mfc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-samsung/s5p-dev-mfc.c b/arch/arm/plat-samsung/s5p-dev-mfc.c index 97ece99521ca..a29272818c36 100644 --- a/arch/arm/plat-samsung/s5p-dev-mfc.c +++ b/arch/arm/plat-samsung/s5p-dev-mfc.c @@ -127,27 +127,27 @@ int __init s5p_fdt_find_mfc_mem(unsigned long node, const char *uname, { const __be32 *prop; int len; - struct s5p_mfc_dt_meminfo mfc_mem; + struct s5p_mfc_dt_meminfo *mfc_mem = data; if (!data) return 0; - if (!of_flat_dt_is_compatible(node, mfc_mem.compatible)) + if (!of_flat_dt_is_compatible(node, mfc_mem->compatible)) return 0; prop = of_get_flat_dt_prop(node, "samsung,mfc-l", &len); if (!prop || (len != 2 * sizeof(unsigned long))) return 0; - mfc_mem.loff = be32_to_cpu(prop[0]); - mfc_mem.lsize = be32_to_cpu(prop[1]); + mfc_mem->loff = be32_to_cpu(prop[0]); + mfc_mem->lsize = be32_to_cpu(prop[1]); prop = of_get_flat_dt_prop(node, "samsung,mfc-r", &len); if (!prop || (len != 2 * sizeof(unsigned long))) return 0; - mfc_mem.roff = be32_to_cpu(prop[0]); - mfc_mem.rsize = be32_to_cpu(prop[1]); + mfc_mem->roff = be32_to_cpu(prop[0]); + mfc_mem->rsize = be32_to_cpu(prop[1]); return 1; } |