diff options
| -rw-r--r-- | arch/arm/mach-rockchip/platsmp.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/pm.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index 51984a40b097..4675d9202000 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c | |||
| @@ -245,6 +245,7 @@ static int __init rockchip_smp_prepare_pmu(void) | |||
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | pmu_base = of_iomap(node, 0); | 247 | pmu_base = of_iomap(node, 0); |
| 248 | of_node_put(node); | ||
| 248 | if (!pmu_base) { | 249 | if (!pmu_base) { |
| 249 | pr_err("%s: could not map pmu registers\n", __func__); | 250 | pr_err("%s: could not map pmu registers\n", __func__); |
| 250 | return -ENOMEM; | 251 | return -ENOMEM; |
diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c index 0592534e0b88..065b09e6f1eb 100644 --- a/arch/arm/mach-rockchip/pm.c +++ b/arch/arm/mach-rockchip/pm.c | |||
| @@ -59,7 +59,7 @@ static inline u32 rk3288_l2_config(void) | |||
| 59 | return l2ctlr; | 59 | return l2ctlr; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | static void rk3288_config_bootdata(void) | 62 | static void __init rk3288_config_bootdata(void) |
| 63 | { | 63 | { |
| 64 | rkpm_bootdata_cpusp = rk3288_bootram_phy + (SZ_4K - 8); | 64 | rkpm_bootdata_cpusp = rk3288_bootram_phy + (SZ_4K - 8); |
| 65 | rkpm_bootdata_cpu_code = __pa_symbol(cpu_resume); | 65 | rkpm_bootdata_cpu_code = __pa_symbol(cpu_resume); |
| @@ -230,7 +230,7 @@ static void rk3288_suspend_finish(void) | |||
| 230 | pr_err("%s: Suspend finish failed\n", __func__); | 230 | pr_err("%s: Suspend finish failed\n", __func__); |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | static int rk3288_suspend_init(struct device_node *np) | 233 | static int __init rk3288_suspend_init(struct device_node *np) |
| 234 | { | 234 | { |
| 235 | struct device_node *sram_np; | 235 | struct device_node *sram_np; |
| 236 | struct resource res; | 236 | struct resource res; |
