From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asP5g-00057Y-CE for qemu-devel@nongnu.org; Tue, 19 Apr 2016 02:24:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asP5d-0006Fq-6g for qemu-devel@nongnu.org; Tue, 19 Apr 2016 02:24:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asP5d-0006FT-1O for qemu-devel@nongnu.org; Tue, 19 Apr 2016 02:24:49 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83115C01AA24 for ; Tue, 19 Apr 2016 06:24:47 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 19 Apr 2016 08:24:44 +0200 Message-Id: <1461047084-17810-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1461047084-17810-1-git-send-email-kraxel@redhat.com> References: <1461047084-17810-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/2] Revert "ehci: make idt processing more robust" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann This reverts commit 156a2e4dbffa85997636a7a39ef12da6f1b40254. Breaks FreeBSD. Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-ehci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index d5c0e1c..43a8f7a 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1397,7 +1397,7 @@ static int ehci_process_itd(EHCIState *ehci, { USBDevice *dev; USBEndpoint *ep; - uint32_t i, len, pid, dir, devaddr, endp, xfers = 0; + uint32_t i, len, pid, dir, devaddr, endp; uint32_t pg, off, ptr1, ptr2, max, mult; ehci->periodic_sched_active = PERIODIC_ACTIVE; @@ -1489,10 +1489,9 @@ static int ehci_process_itd(EHCIState *ehci, ehci_raise_irq(ehci, USBSTS_INT); } itd->transact[i] &= ~ITD_XACT_ACTIVE; - xfers++; } } - return xfers ? 0 : -1; + return 0; } -- 1.8.3.1