commit fef13fa8e4de9255cad32192ff76e007568cf1b3
author Brad Hards <bradh@frogmouth.net> Sun Apr 03 15:33:20 2011 +1000
committer Gerd Hoffmann <kraxel@redhat.com> Thu May 26 11:55:02 2011 +0200
tree 6a136c6eda1772bcfe6a5df2cf63e254d1a9f693
parent add750882f327db813af0795727efe5e4579ca5c

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>

hw/usb-desc.c

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 @@
 {
     uint8_t  bLength = 0x09;
     uint16_t wTotalLength = 0;
-    int i, rc, count;
+    int i, rc;
 
     if (len < bLength) {
         return -1;
@@ -91,8 +91,7 @@
     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;