From 6c3cc6ff21a2255eb030c97869909036d6019467 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 9 Jun 2008 22:20:04 +1000 Subject: [PATCH] --- yaml --- r: 98179 b: refs/heads/master c: bad5232ba266ae2c666c17be236152fb2d8ada3b h: refs/heads/master i: 98177: 042a194cb130da1e0e4793d9d4fe52245a697fbf 98175: 834c683b62e867668d3b738318563ac0c90cc3f2 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/nvram.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ca4ac7109c9..37cbf20745bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 476ff8a0e3b17fc23994255aa9fd917d599d2ec7 +refs/heads/master: bad5232ba266ae2c666c17be236152fb2d8ada3b diff --git a/trunk/arch/powerpc/platforms/pseries/nvram.c b/trunk/arch/powerpc/platforms/pseries/nvram.c index f68903e15bd5..42f7e384e6c4 100644 --- a/trunk/arch/powerpc/platforms/pseries/nvram.c +++ b/trunk/arch/powerpc/platforms/pseries/nvram.c @@ -131,8 +131,10 @@ int __init pSeries_nvram_init(void) return -ENODEV; nbytes_p = of_get_property(nvram, "#bytes", &proplen); - if (nbytes_p == NULL || proplen != sizeof(unsigned int)) + if (nbytes_p == NULL || proplen != sizeof(unsigned int)) { + of_node_put(nvram); return -EIO; + } nvram_size = *nbytes_p;