From patchwork Tue Mar 29 02:31:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 88714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 60599B6ED0 for ; Tue, 29 Mar 2011 13:36:48 +1100 (EST) Received: from localhost ([127.0.0.1]:33176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4OnV-0003qu-Sz for incoming@patchwork.ozlabs.org; Mon, 28 Mar 2011 22:36:45 -0400 Received: from [140.186.70.92] (port=34246 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4Oj6-0000j7-Bu for qemu-devel@nongnu.org; Mon, 28 Mar 2011 22:32:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q4Oj5-0004PC-AM for qemu-devel@nongnu.org; Mon, 28 Mar 2011 22:32:12 -0400 Received: from smtpout3.three.com.au ([202.124.68.59]:55932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q4Oj4-0004ND-UQ for qemu-devel@nongnu.org; Mon, 28 Mar 2011 22:32:11 -0400 Received: from auumvs2fe06.three.com.au (auhgvpsmtp.three.com.au [10.176.77.86]) by smtpout3.three.com.au (Postfix) with ESMTP id 839DA759FA; Tue, 29 Mar 2011 12:32:04 +1000 (EST) Received: from localhost.localdomain ([10.169.92.157]) by auumvs2fe06.three.com.au with ESMTP id p2T2Vuac004090-p2T2Vuag004090; Tue, 29 Mar 2011 12:32:02 +1000 From: Brad Hards To: qemu-devel@nongnu.org Date: Tue, 29 Mar 2011 13:31:34 +1100 Message-Id: <1301365895-15056-4-git-send-email-bradh@frogmouth.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1301365895-15056-1-git-send-email-bradh@frogmouth.net> References: <1301365895-15056-1-git-send-email-bradh@frogmouth.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 202.124.68.59 Cc: Brad Hards Subject: [Qemu-devel] [PATCH 3/4] usb: remove fallback to bNumInterfaces if no .nif X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org All callers have been updated. --- hw/usb-desc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/usb-desc.c b/hw/usb-desc.c index 62591f2..a784155 100644 --- a/hw/usb-desc.c +++ b/hw/usb-desc.c @@ -76,7 +76,7 @@ int usb_desc_config(const USBDescConfig *conf, uint8_t *dest, size_t len) { uint8_t bLength = 0x09; uint16_t wTotalLength = 0; - int i, rc, count; + int i, rc; if (len < bLength) { return -1; @@ -91,8 +91,7 @@ int usb_desc_config(const USBDescConfig *conf, uint8_t *dest, size_t len) dest[0x08] = conf->bMaxPower; wTotalLength += bLength; - count = conf->nif ? conf->nif : conf->bNumInterfaces; - for (i = 0; i < count; i++) { + for (i = 0; i < conf->nif; i++) { rc = usb_desc_iface(conf->ifs + i, dest + wTotalLength, len - wTotalLength); if (rc < 0) { return rc;