summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2014-05-13 11:39:42 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2014-07-15 19:28:02 -0500
commitbb485bf2e85e134f8f7869ac2e8855adad8ee688 (patch)
treef8482e8599803ab40c87b71cb81b82da85e5d9de
parent02835d57444ce7308931b71cabbe5fb1d7d8b9eb (diff)
downloadqemu-bb485bf2e85e134f8f7869ac2e8855adad8ee688.tar.gz
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>
-rw-r--r--hw/sd/sdhci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 0906a1d62b..9e8a236070 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1185,8 +1185,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);