Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Mar 2022 12:28:08 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 56ef5ad21fb0 - releng/13.1 - Make sure the avr32dci_odevd structure is used. This fixes a compilation error.
Message-ID:  <202203171228.22HCS8ee083812@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/13.1 has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=56ef5ad21fb071e09ef6dc2470d7e20f6da17d62

commit 56ef5ad21fb071e09ef6dc2470d7e20f6da17d62
Author:     Hans Petter Selasky <hselasky@FreeBSD.org>
AuthorDate: 2021-07-10 16:13:21 +0000
Commit:     Hans Petter Selasky <hselasky@FreeBSD.org>
CommitDate: 2022-03-17 12:25:59 +0000

    Make sure the avr32dci_odevd structure is used.
    This fixes a compilation error.
    
    Sponsored by:   NVIDIA Networking
    Approved by:    re (gjb)
    
    (cherry picked from commit 3f5054862a4603116bb872cf8b7b3cc946e93741)
    (cherry picked from commit cea6dbdf1bae404ac7299e5f3a7755b81b2d23e5)
---
 sys/dev/usb/controller/avr32dci.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sys/dev/usb/controller/avr32dci.c b/sys/dev/usb/controller/avr32dci.c
index 20f9a0e6bd4b..67255f051855 100644
--- a/sys/dev/usb/controller/avr32dci.c
+++ b/sys/dev/usb/controller/avr32dci.c
@@ -1656,6 +1656,12 @@ tr_handle_get_descriptor:
 		len = sizeof(avr32dci_devd);
 		ptr = (const void *)&avr32dci_devd;
 		goto tr_valid;
+	case UDESC_DEVICE_QUALIFIER:
+		if (value & 0xff)
+			goto tr_stalled;
+		len = sizeof(avr32dci_odevd);
+		ptr = (const void *)&avr32dci_odevd;
+		goto tr_valid;
 	case UDESC_CONFIG:
 		if (value & 0xff) {
 			goto tr_stalled;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203171228.22HCS8ee083812>