From b63bad5f14d9698eae0d5be31ad4c589ec763b0a Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 2 Jul 2008 10:00:56 -0500 Subject: [PATCH] --- yaml --- r: 101788 b: refs/heads/master c: a712b65cd015d9bd05bce01f57a42cd6c73c4aa0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 299415418259..8ab749705ef9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e82eb333949e2f1652bf70d36dfaa875306ae11 +refs/heads/master: a712b65cd015d9bd05bce01f57a42cd6c73c4aa0 diff --git a/trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c index b010dc9dec65..8b2d63d4264e 100644 --- a/trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/trunk/arch/powerpc/platforms/85xx/mpc85xx_ds.c @@ -58,14 +58,13 @@ void __init mpc85xx_ds_pic_init(void) { struct mpic *mpic; struct resource r; - struct device_node *np = NULL; + struct device_node *np; #ifdef CONFIG_PPC_I8259 struct device_node *cascade_node = NULL; int cascade_irq; #endif np = of_find_node_by_type(np, "open-pic"); - if (np == NULL) { printk(KERN_ERR "Could not find open-pic node\n"); return; @@ -82,6 +81,7 @@ void __init mpc85xx_ds_pic_init(void) MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS, 0, 256, " OpenPIC "); BUG_ON(mpic == NULL); + of_node_put(np); mpic_init(mpic); @@ -185,7 +185,7 @@ static int __init mpc8544_ds_probe(void) } } -static struct of_device_id mpc85xxds_ids[] = { +static struct of_device_id __initdata mpc85xxds_ids[] = { { .type = "soc", }, { .compatible = "soc", }, {},