From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z83-0005Sf-DZ for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:25:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4Z78-0001RT-1w for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:24:31 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:34593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z77-0001R9-St for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:23:33 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Jul 2014 13:23:33 -0400 From: Michael Roth Date: Tue, 8 Jul 2014 12:19:05 -0500 Message-Id: <1404839947-1086-155-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 154/156] sdhci: Fix misuse of qemu_free_irqs() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Andreas Färber It does a g_free() on the pointer, so don't pass a local &foo reference. Reviewed-by: Peter Crosthwaite Reviewed-by: Peter Maydell Cc: qemu-stable@nongnu.org Signed-off-by: Andreas Färber (cherry picked from commit 127a4e1a51c038ec9167083b65d376dddcc64530) Signed-off-by: Michael Roth --- hw/sd/sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 0906a1d..9e8a236 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); -- 1.9.1