From 621839136cd77a0fcc8e45178485c27b204078d9 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 1 Aug 2009 10:52:51 +0200 Subject: [PATCH] --- yaml --- r: 161727 b: refs/heads/master c: 3475dd8a68a7c705bee88b143422ba02cb9a796b h: refs/heads/master i: 161725: a71b7baf593de07fc23eac1f96c69c93e6a37da8 161723: 52901468836b7ce234e42379155f5cf8d6a49f06 161719: ee3b94e93c4698ef8c81dc80be3717e685188c69 161711: 1ac6c685adfc1ea0c887de28cf5d8568e5b36877 161695: e1ae08995cfe433f4b158c7fc31c0678eaf4e42c 161663: c8be50132fb77723d944983df870a0b9ac06b8a3 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e96f5c735ddc..b56c9924846d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a626b66bbd17e775cf2210e560b29383110290e +refs/heads/master: 3475dd8a68a7c705bee88b143422ba02cb9a796b diff --git a/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c b/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c index 074905c3ee5a..3faa42e03a85 100644 --- a/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c @@ -339,8 +339,10 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags, qe_ic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, NR_QE_IC_INTS, &qe_ic_host_ops, 0); - if (qe_ic->irqhost == NULL) + if (qe_ic->irqhost == NULL) { + kfree(qe_ic); return; + } qe_ic->regs = ioremap(res.start, res.end - res.start + 1); @@ -352,6 +354,7 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags, if (qe_ic->virq_low == NO_IRQ) { printk(KERN_ERR "Failed to map QE_IC low IRQ\n"); + kfree(qe_ic); return; }