From nobody Thu Mar 17 12:28:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DCE221A2555F; Thu, 17 Mar 2022 12:28:09 +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 4KK5yd0gmlz4qtj; Thu, 17 Mar 2022 12:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rJlt6gon3Qfh6fUrwwLs1cJfKMG6LHeUXJbi8dQGoRg=; b=dx0JzgpeSINtlinj6+MtRw/7gHns2RAVMzhCWfxUsUyoyecBmIDWuIFgeQZnd2rgFQWhYq AcLM0utX+0PTwYwlpXYU1EJ3t5b2s0QxVkVJ44b0CqvvbVBFLX5HlUy2z1IzeWzXCmPv2D 6VMYLA8QmjzOrzZEZNEDvr3d5ioGmOKXRAWVDRVQU8VARBRtbXExNl+poLWFJxKrY0QEPw EMqseDXxyyqRuFn6Y6q5By8g/rmOmh1sUOE6lAqd8juRGHo4s2cyQTCkEjSu5gtZTg3cDA VdNe7k9DzvUPLFn1n0wdk0SzKJBFmArnLaaapv+lBNSa+hMk6V9b8i1AiLeXDg== 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 E14582702; Thu, 17 Mar 2022 12:28:08 +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 22HCS83r083813; Thu, 17 Mar 2022 12:28:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HCS8ee083812; Thu, 17 Mar 2022 12:28:08 GMT (envelope-from git) Date: Thu, 17 Mar 2022 12:28:08 GMT Message-Id: <202203171228.22HCS8ee083812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 56ef5ad21fb0 - releng/13.1 - Make sure the avr32dci_odevd structure is used. This fixes a compilation error. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 56ef5ad21fb071e09ef6dc2470d7e20f6da17d62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rJlt6gon3Qfh6fUrwwLs1cJfKMG6LHeUXJbi8dQGoRg=; b=mZsubwP655IPY9t5+rrDmpE9Og7o1yhx237+qzYBwf/R8uhD7oPi469kOW3OynWvasErUj ybWsT72ggZQdB8UWWpgTxz+W23m6EgG84QZiv0zkmZXZIHLuw/MUPZUx+JhnAAGtS8gM8L A/s6LOd44MEQtet2WURKyzMG7PyznDHOF69iiea/nwsADw2Ymm54bKozIWH8bz3t6M43Aj 5KrFd9DVLTAgcJrO5uYnmnZ/Lp3IbFu57KSQ7WNQLdAiH4OtJmeZXfitQweJZ1cmx70Y9S uLif1KT4cjX4po3GrdLAmRogFewNL9IlVX6NNEACMIsnBQSZpE/EfL2No7gKcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647520089; a=rsa-sha256; cv=none; b=NvoBZBfX0ZqvEVoGkhVx7lIGnp5NpiCiKRpPLSzRQnpIesuQKy9x/jzRmtbsQUCBtfYgHn OpMTcU/ziI4JpSYdKfxngWp57h0q6WAnZzx1JMoJtTbFREJElPZrBob8iIcQxnAtR8/ZQd 7V8sk3/HlRXoWwgCwSIidnDwfsAJ5Q29HTJ8eEA0xFfserzzHhTG6+pCQVEwbYDggzWicD 86KXiAGH3nyHHvI4Pk+ZMzqIkMkiWidiM/vKT/0kIWzsZWFnHoXoHJBphJ1ANQhziQLGHC c5eGVeqKKGcqv4O04d+2c01pK2XUQtpN4muWgD1O/73urTs1iGlq2LM38px3UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2021-07-10 16:13:21 +0000 Commit: Hans Petter Selasky 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;