From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmJ6D-0002UI-2h for qemu-devel@nongnu.org; Fri, 29 Nov 2013 03:06:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmJ60-0002BX-Fw for qemu-devel@nongnu.org; Fri, 29 Nov 2013 03:06:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmJ60-0002B6-8l for qemu-devel@nongnu.org; Fri, 29 Nov 2013 03:06:40 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAT86dTo018757 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 29 Nov 2013 03:06:39 -0500 From: Gerd Hoffmann Date: Fri, 29 Nov 2013 09:06:10 +0100 Message-Id: <1385712381-30918-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1385712381-30918-1-git-send-email-kraxel@redhat.com> References: <1385712381-30918-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 06/17] uas: Streams are numbered 1-y, rather then 0-x List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hans de Goede , Gerd Hoffmann From: Hans de Goede It is easier to simply make the arrays one larger, rather then substracting one everywhere. Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann --- hw/usb/dev-uas.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 12d79ef..70f41d3 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -122,8 +122,8 @@ struct UASDevice { UASRequest *dataout2; /* usb 3.0 only */ - USBPacket *data3[UAS_MAX_STREAMS]; - USBPacket *status3[UAS_MAX_STREAMS]; + USBPacket *data3[UAS_MAX_STREAMS + 1]; + USBPacket *status3[UAS_MAX_STREAMS + 1]; }; struct UASRequest { @@ -666,7 +666,7 @@ static void usb_uas_cancel_io(USBDevice *dev, USBPacket *p) return; } if (uas_using_streams(uas)) { - for (i = 0; i < UAS_MAX_STREAMS; i++) { + for (i = 0; i <= UAS_MAX_STREAMS; i++) { if (uas->status3[i] == p) { uas->status3[i] = NULL; return; -- 1.8.3.1