]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
sdhci: Fix misuse of qemu_free_irqs()
authorAndreas Färber <afaerber@suse.de>
Tue, 13 May 2014 09:39:42 +0000 (11:39 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 6 Aug 2014 16:53:56 +0000 (11:53 -0500)
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>
hw/sd/sdhci.c

index 843e697bfe10029fb26cffe98e7ed48eb4065c16..32f2d0f560c25f71d49ae1a9670c45a7f5187509 100644 (file)
@@ -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);