From patchwork Sun Feb 26 15:14:47 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: 143091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 069AEB6F98 for ; Mon, 27 Feb 2012 02:13:31 +1100 (EST) Received: from localhost ([::1]:48922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1fmx-0008Ca-OR for incoming@patchwork.ozlabs.org; Sun, 26 Feb 2012 10:13:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1fmj-0007xQ-9w for qemu-devel@nongnu.org; Sun, 26 Feb 2012 10:13:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S1fmi-0001rj-76 for qemu-devel@nongnu.org; Sun, 26 Feb 2012 10:13:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1fmh-0001ra-Vc for qemu-devel@nongnu.org; Sun, 26 Feb 2012 10:13:12 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1QFDBYC007949 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 Feb 2012 10:13:11 -0500 Received: from shalem.localdomain.com (vpn1-7-62.ams2.redhat.com [10.36.7.62]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q1QFD4Ge005987; Sun, 26 Feb 2012 10:13:10 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Sun, 26 Feb 2012 16:14:47 +0100 Message-Id: <1330269288-5578-5-git-send-email-hdegoede@redhat.com> In-Reply-To: <1330269288-5578-1-git-send-email-hdegoede@redhat.com> References: <1330269288-5578-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 5/6] usb-redir: Return USB_RET_NAK when we've no data for an interrupt endpoint 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 We should return USB_RET_NAK, rather then a 0 sized packet, when we've no data for an interrupt IN endpoint. Signed-off-by: Hans de Goede --- usb-redir.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/usb-redir.c b/usb-redir.c index c76e55d..ea828a8 100644 --- a/usb-redir.c +++ b/usb-redir.c @@ -558,7 +558,9 @@ static int usbredir_handle_interrupt_data(USBRedirDevice *dev, /* Check interrupt_error for stream errors */ status = dev->endpoint[EP2I(ep)].interrupt_error; dev->endpoint[EP2I(ep)].interrupt_error = 0; - return usbredir_handle_status(dev, status, 0); + if (status) + return usbredir_handle_status(dev, status, 0); + return USB_RET_NAK; } DPRINTF("interrupt-token-in ep %02X status %d len %d\n", ep, intp->status, intp->len);