diff options
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 1903290f5469..ce557f6f00fc 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -587,8 +587,10 @@ struct irq_host *irq_alloc_host(struct device_node *of_node, | |||
| 587 | * this will be fixed once slab is made available early | 587 | * this will be fixed once slab is made available early |
| 588 | * instead of the current cruft | 588 | * instead of the current cruft |
| 589 | */ | 589 | */ |
| 590 | if (mem_init_done) | 590 | if (mem_init_done) { |
| 591 | of_node_put(host->of_node); | ||
| 591 | kfree(host); | 592 | kfree(host); |
| 593 | } | ||
| 592 | return NULL; | 594 | return NULL; |
| 593 | } | 595 | } |
| 594 | irq_map[0].host = host; | 596 | irq_map[0].host = host; |
| @@ -1143,7 +1145,7 @@ static int virq_debug_show(struct seq_file *m, void *private) | |||
| 1143 | unsigned long flags; | 1145 | unsigned long flags; |
| 1144 | struct irq_desc *desc; | 1146 | struct irq_desc *desc; |
| 1145 | const char *p; | 1147 | const char *p; |
| 1146 | char none[] = "none"; | 1148 | static const char none[] = "none"; |
| 1147 | int i; | 1149 | int i; |
| 1148 | 1150 | ||
| 1149 | seq_printf(m, "%-5s %-7s %-15s %s\n", "virq", "hwirq", | 1151 | seq_printf(m, "%-5s %-7s %-15s %s\n", "virq", "hwirq", |