From 50883470a5b50c8c8136f40647ba1039143f3f50 Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Fri, 26 Dec 2014 22:26:14 +0800 Subject: [PATCH] Revert "rk: ion: fix dts parse failure on arm64" This reverts commit e46863d23c4753b4f523dcdde0a907c06df40494. --- drivers/staging/android/ion/rockchip/rockchip_ion.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c index 11f07444c87b..a758a17d3e4b 100755 --- a/drivers/staging/android/ion/rockchip/rockchip_ion.c +++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c @@ -274,7 +274,7 @@ int __init rockchip_ion_find_heap(unsigned long node, const char *uname, return 0; prop = of_get_flat_dt_prop(node, "rockchip,ion_heap", &len); - if (!prop || (len != sizeof(__be32))) + if (!prop || (len != sizeof(unsigned long))) return 0; heap = &pdata->heaps[pdata->nr++]; @@ -283,10 +283,10 @@ int __init rockchip_ion_find_heap(unsigned long node, const char *uname, rockchip_ion_populate_heap(heap); prop = of_get_flat_dt_prop(node, "reg", &len); - if (prop && (len >= 2*sizeof(__be32))) { + if (prop && (len >= 2*sizeof(unsigned long))) { heap->base = be32_to_cpu(prop[0]); heap->size = be32_to_cpu(prop[1]); - if (len==3*sizeof(__be32)) + if (len==3*sizeof(unsigned long)) heap->align = be32_to_cpu(prop[2]); } -- 2.34.1