summary refs log tree commit diff stats
path: root/hw/usb/dev-audio.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-09-01 15:13:07 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-09-01 15:13:07 +0100
commit4c41a1c595e1ce3fe29f3b7bb22ff7402be9c77d (patch)
tree12a0c4b757d9c84d4fa59824333f8c0066ed9ca4 /hw/usb/dev-audio.c
parent9ca9f47fdaf5deaf6f073e0b81de575a6cb73445 (diff)
parentae420c957aff2871b8a1af9cf9ee1a7a75b3552b (diff)
downloadfocaccia-qemu-4c41a1c595e1ce3fe29f3b7bb22ff7402be9c77d.tar.gz
focaccia-qemu-4c41a1c595e1ce3fe29f3b7bb22ff7402be9c77d.zip
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20210901-pull-request' into staging
usb: bugfixes.

# gpg: Signature made Wed 01 Sep 2021 07:53:33 BST
# gpg:                using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20210901-pull-request:
  hw/usb: Fix typo in comments and print
  uas: add stream number sanity checks.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-audio.c')
-rw-r--r--hw/usb/dev-audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index f5cb246792..8748c1ba04 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -168,7 +168,7 @@ static const USBDescIface desc_iface[] = {
                     STRING_FEATURE_UNIT,        /*  u8  iFeature */
                 }
             },{
-                /* Headphone Ouptut Terminal ID3 Descriptor */
+                /* Headphone Output Terminal ID3 Descriptor */
                 .data = (uint8_t[]) {
                     0x09,                       /*  u8  bLength */
                     USB_DT_CS_INTERFACE,        /*  u8  bDescriptorType */
@@ -332,7 +332,7 @@ static const USBDescIface desc_iface_multi[] = {
                     STRING_FEATURE_UNIT,        /*  u8  iFeature */
                 }
             },{
-                /* Headphone Ouptut Terminal ID3 Descriptor */
+                /* Headphone Output Terminal ID3 Descriptor */
                 .data = (uint8_t[]) {
                     0x09,                       /*  u8  bLength */
                     USB_DT_CS_INTERFACE,        /*  u8  bDescriptorType */