From nobody Thu Mar 10 08:35:39 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 1C3AB1A035D3; Thu, 10 Mar 2022 08:35:40 +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 4KDj7b5h8zz4Yr0; Thu, 10 Mar 2022 08:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646901340; 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=RLyzDE/7G50MMm3dOuJ4pwHXbCDCABkNIUnZUuGAPGQ=; b=bOcXXPJnV4zPkizrDfMevxFCP/u56P/ZWsLhnoJflKjR8uI2L/k+WMGB6CsMktR1zslLE4 LqJcx3kxvlW3Vay1R6w7NscEeaWwGvfXqAZt/pH1GIA2XwoJ+dWPuqvckbcCERapjo+xrz qG6P7OxxsZ40bgtWhJxO8p+xCanar9H8PxLiGSPSEJRlpoVudFdiR8x7TJZcZigaHODyiL Nf+4rJHt4TOLT6CQGFTZQqguNGZXDDJnvs/vS0utoxTLwbyUa1Jlud1WxKYjsN/VBm41Um aGFatyYttd2k1WE41wHVJbez+LZxrDCZUnUJGqvM9C16NNcldVD2j7BIa5381A== 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 821E3219B1; Thu, 10 Mar 2022 08:35:39 +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 22A8ZdAe003448; Thu, 10 Mar 2022 08:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22A8Zdsx003447; Thu, 10 Mar 2022 08:35:39 GMT (envelope-from git) Date: Thu, 10 Mar 2022 08:35:39 GMT Message-Id: <202203100835.22A8Zdsx003447@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: cea6dbdf1bae - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: cea6dbdf1bae404ac7299e5f3a7755b81b2d23e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646901340; 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=RLyzDE/7G50MMm3dOuJ4pwHXbCDCABkNIUnZUuGAPGQ=; b=cXfLQtGSiNcb/lv9BcYpFP1+kqB4jlx/wIJ3zEP1uiY5tw/QXWckWqVnj0qTD+WmC4ijp/ 8HV8uyhdj7h9tiAn6d7Le6QxPH7RWT03mWWvLnDaRANL/FJKYi5jNkxfQDjj06wJZPdw8V IWpUXjvLjBJ4yhCsvtn/H0WwUfFR16lXUsufFzsEN/+sR0DJ9BhJToPr0ILa/D85D97IhY O25Gt6HlA+1lxQxyEdMl5J892v0QPWUUf7NI7dChgE70p6kVcPOMuHeR3/OBlvM0/LG9Qu VL55dRA+0HBWmdGsn23n8DT1V9PalnmW9mOUZTIWDjUCYRJk5n8HFDRXlzxPcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646901340; a=rsa-sha256; cv=none; b=MiR64lZr1CGf9JYMLwgMBdTbJuJG5nYsLFiymp1RxNoCkNJHBRmPTiWfepaScwdOPTOcut IqNEDgqndVde7tStDQv0yL7sdgFpViKhYFDRLxuzRkM0JySnR/ngyqvwwIAALM7VAS/BB5 XV6BcrtrS5uA1yvPohfj/DJolQaNXH4Z/0Xd1kHF+IT6kpyamKN9ABPjGJGa6Nqq27xUet wUazIkrDsqx3wPBMi38cYMtwlnG1pf2oGQowM00nVjOmvZhH6+iwVo2/Hvzb7TbzQDv0Po 10yq/coYGaiTJ2hME9kBYR+AwKWGYhwy5zVm0d9AP+j3O4j+HO1U5nrMkErWVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=cea6dbdf1bae404ac7299e5f3a7755b81b2d23e5 commit cea6dbdf1bae404ac7299e5f3a7755b81b2d23e5 Author: Hans Petter Selasky AuthorDate: 2021-07-10 16:13:21 +0000 Commit: Hans Petter Selasky CommitDate: 2022-03-10 08:29:22 +0000 Make sure the avr32dci_odevd structure is used. This fixes a compilation error. Sponsored by: NVIDIA Networking (cherry picked from commit 3f5054862a4603116bb872cf8b7b3cc946e93741) --- 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;