From: Andreas Färber <afaerber@suse.de>
Date: Tue, 13 May 2014 09:39:42 +0000 (+0200)
Subject: sdhci: Fix misuse of qemu_free_irqs()
X-Git-Tag: qemu-xen-4.5.0-rc1^2~24
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7be09afb615682da0d162ebc0259b185f73725eb;p=qemu-upstream-4.5-testing.git

sdhci: Fix misuse of qemu_free_irqs()

It does a g_free() on the pointer, so don't pass a local &foo reference.

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
(cherry picked from commit 127a4e1a51c038ec9167083b65d376dddcc64530)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 843e697bf..32f2d0f56 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1184,8 +1184,8 @@ static void sdhci_uninitfn(Object *obj)
     timer_free(s->insert_timer);
     timer_del(s->transfer_timer);
     timer_free(s->transfer_timer);
-    qemu_free_irqs(&s->eject_cb);
-    qemu_free_irqs(&s->ro_cb);
+    qemu_free_irq(s->eject_cb);
+    qemu_free_irq(s->ro_cb);
 
     if (s->fifo_buffer) {
         g_free(s->fifo_buffer);