Patchwork [3/4] usb: remove fallback to bNumInterfaces if no .nif

login
register
mail settings
Submitter Brad Hards
Date April 3, 2011, 5:33 a.m.
Message ID <1301808801-7850-4-git-send-email-bradh@frogmouth.net>
Download mbox | patch
Permalink /patch/89468/
State New
Headers show

Comments

Brad Hards - April 3, 2011, 5:33 a.m.
All callers have been updated.

Signed-off-by: Brad Hards <bradh@frogmouth.net>
---
 hw/usb-desc.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Patch

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;