From nobody Tue Jun 20 16:29:23 2023 X-Original-To: dev-commits-src-main@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 4QlsXh35pXz4gJRg; Tue, 20 Jun 2023 16:29:24 +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 4QlsXg4s96z4L3R; Tue, 20 Jun 2023 16:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278563; 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=dOJhPAvcZZgvbHbdq+dWQ9dy0aZjxNlpc76F5isqem0=; b=iZTHlZyJx3opITh8dIH96FjKuV3039T25lDbruZHKBSO4yejJnqOPM1vBW+yt7HsF/vIKb a+s7xRF5PHvY7f78+IzrlOjBwcA8taxxV4EYujBmrEqz1kK7UgT5BNWevPLf8a1rUwy3GH LAeY1kImouY2w4NQNA2F0k3lkgncIkfAue9t7z0RxU6rAQHMKiKMDiOiw3iWM0Z9W9fndF r0NpFHcAn41o4IXni9yPkslQuYLO+L9k6QUZo7kXzmaBjI9NOF4BgwjYKjjziyXLuS4KSe xxvdjQK3JWFt8y++zKiazDqC7ZROwGkqI4b+ERwNfek9aNVDxrvFz4PhHolp1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278563; 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=dOJhPAvcZZgvbHbdq+dWQ9dy0aZjxNlpc76F5isqem0=; b=REhedqv+7WPPVDZwDgbsuv9v1MBzdabZyxvdbKGmLBXcscwCjQj2gg+jsqnqN1hU5CXN5W w8O5g6As99OjilSTVmVjCp3fcwJSg9ZmniNn6j/mrv0A0e3wPKYb7rnQjminRvR4zZ0/2R z1WK79xL3b1FFJASdt/neZ3AUl0fK7fU2ozgZVpgsjC20t6xFF6Eu9L7OWaYtlHsY7HX+h PWf0FVhHP2VPZ8fHENHODTUX+Kvq96LIWNjcl72AJ9FfQ7uK+qasXmDYOzrIgxsYaOTDEk 6UTq8TGDlXeV6wrSP6hpoDhaXGq+1RWTYpYHs9EzSXwB/hrfn9+chRbymPfViA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278563; a=rsa-sha256; cv=none; b=QKymAqNRFb+gDJLY1+8mAkxjDosWt9m9o/IFa+hBW40PT3jg6FIdbWVALOz8S1lNvOzW8K Lo6BU/H/T65NC+PhGNG8D0i1Sy1LI9dhoYgNraVUKPrnvNO/F9FrqxnqTwL7u9vZOV4ed2 m/CGZT19/Fa8feDKb7Rcdfme4xVLiXUQnaOMVmDCmKV0y2RS+lMtUfDyn48vDwZwgkg8jf AJFR519bujKcnwIvk2bg/MsK5HuydUVqfeq7TWuDlT5PfATDhs8OFZK6qvERAtQeudJ+gp qzz/rLP5H3CXanUxcEDoxvb3GfoRQRtbUThQ/+7Sq+mv42aIKmaFUHUik0yAiQ== 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 4QlsXg3nK7z15sY; Tue, 20 Jun 2023 16:29:23 +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 35KGTNZc045180; Tue, 20 Jun 2023 16:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTNuh045179; Tue, 20 Jun 2023 16:29:23 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:23 GMT Message-Id: <202306201629.35KGTNuh045179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5f0bd2918061 - main - bluetooth/ath3kfw: Propagate return value from ath3k_load_fwfile. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f0bd29180616c726ed3ded5e746f23aaf8aabc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5f0bd29180616c726ed3ded5e746f23aaf8aabc4 commit 5f0bd29180616c726ed3ded5e746f23aaf8aabc4 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 bluetooth/ath3kfw: Propagate return value from ath3k_load_fwfile. The caller ignores the return value so this is a no-op, but ath3k_init_ar3012 returns the return values of its internal functions, so this is more consistent. Fix some misleading indentation while here. Reported by: GCC -Wunused-but-set-variable (1) --- usr.sbin/bluetooth/ath3kfw/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bluetooth/ath3kfw/main.c b/usr.sbin/bluetooth/ath3kfw/main.c index 6ca5206b1507..25dca398c902 100644 --- a/usr.sbin/bluetooth/ath3kfw/main.c +++ b/usr.sbin/bluetooth/ath3kfw/main.c @@ -155,7 +155,7 @@ ath3k_init_ar3012(libusb_device_handle *hdl, const char *fw_path) ret = ath3k_load_patch(hdl, fw_path); if (ret < 0) { ath3k_err("Loading patch file failed\n"); - return (ret); + return (ret); } ret = ath3k_load_syscfg(hdl, fw_path); @@ -199,7 +199,7 @@ ath3k_init_firmware(libusb_device_handle *hdl, const char *file_prefix) /* free it */ ath3k_fw_free(&fw); - return (0); + return (ret); } /*