From owner-dev-commits-src-all@freebsd.org Sat Jul 10 19:04:49 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 59A9B65992E; Sat, 10 Jul 2021 19:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GMfbj1vvSz4j6d; Sat, 10 Jul 2021 19:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 26D6F5A8B; Sat, 10 Jul 2021 19:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16AJ4nv1035461; Sat, 10 Jul 2021 19:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16AJ4nuC035460; Sat, 10 Jul 2021 19:04:49 GMT (envelope-from git) Date: Sat, 10 Jul 2021 19:04:49 GMT Message-Id: <202107101904.16AJ4nuC035460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 3f5054862a46 - main - Make sure the avr32dci_odevd structure is used. This fixes a compilation error. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f5054862a4603116bb872cf8b7b3cc946e93741 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jul 2021 19:04:49 -0000 The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=3f5054862a4603116bb872cf8b7b3cc946e93741 commit 3f5054862a4603116bb872cf8b7b3cc946e93741 Author: Hans Petter Selasky AuthorDate: 2021-07-10 16:13:21 +0000 Commit: Hans Petter Selasky CommitDate: 2021-07-10 17:57:52 +0000 Make sure the avr32dci_odevd structure is used. This fixes a compilation error. MFC after: 1 week Sponsored by: NVIDIA Networking --- 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 eaf0f8261b92..7cc5ca5d90c7 100644 --- a/sys/dev/usb/controller/avr32dci.c +++ b/sys/dev/usb/controller/avr32dci.c @@ -1690,6 +1690,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;