diff options
| author | Brad Hards <bradh@frogmouth.net> | 2011-04-03 15:33:20 +1000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-05-26 11:55:02 +0200 |
| commit | fef13fa8e4de9255cad32192ff76e007568cf1b3 (patch) | |
| tree | 6a136c6eda1772bcfe6a5df2cf63e254d1a9f693 /hw/usb-desc.c | |
| parent | add750882f327db813af0795727efe5e4579ca5c (diff) | |
| download | qemu-fef13fa8e4de9255cad32192ff76e007568cf1b3.zip qemu-fef13fa8e4de9255cad32192ff76e007568cf1b3.tar.gz qemu-fef13fa8e4de9255cad32192ff76e007568cf1b3.tar.bz2 | |
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>
Diffstat (limited to 'hw/usb-desc.c')
| -rw-r--r-- | 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; |