git: 5f0bd2918061 - main - bluetooth/ath3kfw: Propagate return value from ath3k_load_fwfile.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Jun 2023 16:29:23 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=5f0bd29180616c726ed3ded5e746f23aaf8aabc4
commit 5f0bd29180616c726ed3ded5e746f23aaf8aabc4
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-06-20 16:28:59 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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);
}
/*