From patchwork Thu Oct 24 17:15:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 285991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 752DC2C00CA for ; Fri, 25 Oct 2013 04:18:21 +1100 (EST) Received: from localhost ([::1]:55510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZOY7-0006Tv-H1 for incoming@patchwork.ozlabs.org; Thu, 24 Oct 2013 13:18:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZOW7-0003wM-Fa for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZOVy-0006YV-DN for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZOVy-0006Y0-5T for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:06 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9OHG5LU013250 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Oct 2013 13:16:05 -0400 Received: from localhost.localdomain.com (vpn1-7-29.ams2.redhat.com [10.36.7.29]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9OHFwBI001960; Thu, 24 Oct 2013 13:16:04 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Thu, 24 Oct 2013 18:15:52 +0100 Message-Id: <1382634953-9240-5-git-send-email-hdegoede@redhat.com> In-Reply-To: <1382634953-9240-1-git-send-email-hdegoede@redhat.com> References: <1382634953-9240-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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 4/5] uas: Streams are numbered 1-y, rather then 0-x 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 It is easier to simply make the arrays one larger, rather then substracting one everywhere. Signed-off-by: Hans de Goede --- 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;