From patchwork Sat Nov 17 11:11:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 199831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 34A822C008F for ; Sat, 17 Nov 2012 22:10:54 +1100 (EST) Received: from localhost ([::1]:51580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZgIW-0005IU-9f for incoming@patchwork.ozlabs.org; Sat, 17 Nov 2012 06:10:52 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZgHg-0002u6-RL for qemu-devel@nongnu.org; Sat, 17 Nov 2012 06:10:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TZgHd-0005Iu-P4 for qemu-devel@nongnu.org; Sat, 17 Nov 2012 06:10:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZgHd-0005Ii-HS for qemu-devel@nongnu.org; Sat, 17 Nov 2012 06:09:57 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAHB9vlf000644 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 17 Nov 2012 06:09:57 -0500 Received: from shalem.localdomain.com (vpn1-5-33.ams2.redhat.com [10.36.5.33]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAHB9pMH011978; Sat, 17 Nov 2012 06:09:56 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Sat, 17 Nov 2012 12:11:51 +0100 Message-Id: <1353150711-24795-4-git-send-email-hdegoede@redhat.com> In-Reply-To: <1353150711-24795-1-git-send-email-hdegoede@redhat.com> References: <1353150711-24795-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 3/3] uhci: Fix double unlink X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org uhci_async_cancel() already does a uhci_async_unlink(). Signed-off-by: Hans de Goede --- hw/usb/hcd-uhci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 078be2a..8e47803 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -963,7 +963,6 @@ static void uhci_async_complete(USBPort *port, USBPacket *packet) UHCIState *s = async->queue->uhci; if (packet->status == USB_RET_REMOVE_FROM_QUEUE) { - uhci_async_unlink(async); uhci_async_cancel(async); return; }