From: Brad Hards <bradh@frogmouth.net>
Date: Sun, 3 Apr 2011 05:33:20 +0000 (+1000)
Subject: usb: remove fallback to bNumInterfaces if no .nif
X-Git-Tag: qemu-xen-4.3.0-rc1~2749^2~15
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fef13fa8e4de9255cad32192ff76e007568cf1b3;p=qemu-upstream-4.5-testing.git

usb: remove fallback to bNumInterfaces if no .nif

All callers have been updated.

Signed-off-by: Brad Hards <bradh@frogmouth.net>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb-desc.c b/hw/usb-desc.c
index 62591f20a..a784155dc 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;